From patchwork Sat Oct 28 09:20:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 159245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1120771vqb; Sat, 28 Oct 2023 02:20:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHgt+ZUDvYx10Zn5oQo/fLtnIAJ4RY16rqOEM/UzHbyVAvwkSjvJEc6fmeJ9XBi+SgQx14Q X-Received: by 2002:a05:6358:2908:b0:169:49f7:cb1c with SMTP id y8-20020a056358290800b0016949f7cb1cmr6399828rwb.8.1698484835692; Sat, 28 Oct 2023 02:20:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698484835; cv=none; d=google.com; s=arc-20160816; b=FEUD43ToIOEGNANOEj128ig6RB7qtadkIov9NgjkKlbxC7YxqM/IeN5bXUVhS/FAZk JT4ldSZ2zrfQWmKghex0UACVqDPkD7cnSa9flNTyADctE6OfQUIt6FZiyOfWMOt1rpCp D3MGh9jhSSFZiyXT5A9KZ/ST+mmcrftlIzw7DbNHFaxjctXCnzBXaO5LAkUvSr9Wr+aa 4ccgOG52R0LFpYnIkiKMHxlt9PNgPijFvqYfOa73JWB8KrO8For6vhF39z98Z62/YUId eaG37rOJyvOie6V/PGHQhsiRJGyg+2IdCH4BWo5fPAmzIojIJbOru2ouDVXL3gDco1Kg 16/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=gKoxtUXOk+vc7o5XDD2Ngg10fmdWqZmKpllpOAUbRKk=; fh=RPlMGUwBBZqRTxGZSKAMqM1LD7zbCHZNqXehWrsPXDY=; b=jyMKHHEMkIugD9ooRaUQ5gXIe8+KaiO0B5qFQJW53ruh+vZQ2L+28mQmlKhAvxSMDJ FCNlydct6Vi9pefrVUAjBoEyWQLYxrRHW3Tzav8YG6lS31XNSwSUG+dzBAbh8PovkUg/ bX2INyJEob79Gq1IbxAV7z0t+LG2CWTXuQqyTOpJZ0qDDKWLmGIP3XogK80Ct6I8tSmR 3Ae82o3iIMQMSuBhUwN8JauImhlXxcasdfeKWA6xwXDCNh66XYVsyWW8RgawF+RWDq/W TLHZXebyk20yQ2FA9/vduKH2+w2suh5A9yYq+9oxLf8pi6dj1rWPvoUVil+4RGQRq4tH HEKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=0vviCYjX; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=PvxmkOZ8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id y184-20020a638ac1000000b00585463c36fbsi2271560pgd.44.2023.10.28.02.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 02:20:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=0vviCYjX; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=PvxmkOZ8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 77BB280FDDF2; Sat, 28 Oct 2023 02:20:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230000AbjJ1JUX (ORCPT + 28 others); Sat, 28 Oct 2023 05:20:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229643AbjJ1JUS (ORCPT ); Sat, 28 Oct 2023 05:20:18 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CA28F0; Sat, 28 Oct 2023 02:20:15 -0700 (PDT) Date: Sat, 28 Oct 2023 09:20:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1698484813; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gKoxtUXOk+vc7o5XDD2Ngg10fmdWqZmKpllpOAUbRKk=; b=0vviCYjX6rAG2r8LWR/6+aaHxkO1tP3KsPJZlh5biFiZHJHC9pOhvjva+ej8+2Vd+7i/bv YdWScgg54NVruM5IsDWOt0/QhHrFBxvz2as+DHubqmKvovQqY3++s1KEBV+XcdiJKf5J1Q erLR+poVH8URDvzaHQJo+oSt8FHb+fSwt+q6ybChBlmmsTLvbHgOyB6k1l3Ibl3nAtkr34 VbYj53bl2sp3iRem+tMEq3ntZUFBHLlMPDWyzWmHm9FojCuAAahD5rJ3M2adNuOrYlULX6 lk5vL+E8WeuRjaDPbc+TrGE1+OvVcFz0mWM4ooWjC7nwypR7crajj4VEfrPwWw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1698484813; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gKoxtUXOk+vc7o5XDD2Ngg10fmdWqZmKpllpOAUbRKk=; b=PvxmkOZ8GeMaPMDuWc9pawc8wDENY0fYJh6ZhZ6/kMx4a45wryc2OKHUKewXtE5HTt7laB YAv/Nk3bwJ6kbVCA== From: "tip-bot2 for Masahiro Yamada" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/headers] x86/headers: Replace #include with #include Cc: Masahiro Yamada , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230806145958.380314-2-masahiroy@kernel.org> References: <20230806145958.380314-2-masahiroy@kernel.org> MIME-Version: 1.0 Message-ID: <169848481245.3135.12923197367541395563.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 28 Oct 2023 02:20:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780990434846308014 X-GMAIL-MSGID: 1780990434846308014 The following commit has been merged into the x86/headers branch of tip: Commit-ID: 94ea9c05219518ef7ec90b7ef2cb108476df764b Gitweb: https://git.kernel.org/tip/94ea9c05219518ef7ec90b7ef2cb108476df764b Author: Masahiro Yamada AuthorDate: Sun, 06 Aug 2023 23:59:56 +09:00 Committer: Ingo Molnar CommitterDate: Tue, 03 Oct 2023 10:38:07 +02:00 x86/headers: Replace #include with #include The following commit: ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost") deprecated , which is now a wrapper of . Use in *.S as well as in *.c files. After all the lines are replaced, and will be removed. Signed-off-by: Masahiro Yamada Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230806145958.380314-2-masahiroy@kernel.org --- arch/x86/entry/entry.S | 2 +- arch/x86/entry/entry_64.S | 2 +- arch/x86/entry/thunk_32.S | 2 +- arch/x86/entry/thunk_64.S | 2 +- arch/x86/kernel/ftrace_32.S | 2 +- arch/x86/kernel/ftrace_64.S | 2 +- arch/x86/kernel/head_32.S | 2 +- arch/x86/kernel/head_64.S | 3 +-- arch/x86/kernel/irqflags.S | 2 +- arch/x86/lib/checksum_32.S | 2 +- arch/x86/lib/clear_page_64.S | 2 +- arch/x86/lib/cmpxchg8b_emu.S | 2 +- arch/x86/lib/copy_page_64.S | 2 +- arch/x86/lib/copy_user_64.S | 2 +- arch/x86/lib/copy_user_uncached_64.S | 2 +- arch/x86/lib/getuser.S | 2 +- arch/x86/lib/hweight.S | 2 +- arch/x86/lib/memcpy_64.S | 2 +- arch/x86/lib/memmove_32.S | 2 +- arch/x86/lib/memmove_64.S | 2 +- arch/x86/lib/memset_64.S | 2 +- arch/x86/lib/putuser.S | 3 +-- arch/x86/lib/retpoline.S | 2 +- 23 files changed, 23 insertions(+), 25 deletions(-) diff --git a/arch/x86/entry/entry.S b/arch/x86/entry/entry.S index bfb7bcb..8c8d38f 100644 --- a/arch/x86/entry/entry.S +++ b/arch/x86/entry/entry.S @@ -3,8 +3,8 @@ * Common place for both 32- and 64-bit entry routines. */ +#include #include -#include #include .pushsection .noinstr.text, "ax" diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 43606de..be08efa 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -18,6 +18,7 @@ * - SYM_FUNC_START/END:Define functions in the symbol table. * - idtentry: Define exception entry points. */ +#include #include #include #include @@ -34,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/x86/entry/thunk_32.S b/arch/x86/entry/thunk_32.S index ff6e700..0103e10 100644 --- a/arch/x86/entry/thunk_32.S +++ b/arch/x86/entry/thunk_32.S @@ -4,9 +4,9 @@ * Copyright 2008 by Steven Rostedt, Red Hat, Inc * (inspired by Andi Kleen's thunk_64.S) */ + #include #include #include - #include /* put return address in eax (arg1) */ .macro THUNK name, func, put_ret_addr_in_eax=0 diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S index 27b5da2..416b400 100644 --- a/arch/x86/entry/thunk_64.S +++ b/arch/x86/entry/thunk_64.S @@ -4,10 +4,10 @@ * disturbance of register allocation in some inline assembly constructs. * Copyright 2001,2002 by Andi Kleen, SuSE Labs. */ +#include #include #include "calling.h" #include -#include /* rdi: arg1 ... normal C conventions. rax is saved/restored. */ .macro THUNK name, func diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S index 24c1175..58d9ed5 100644 --- a/arch/x86/kernel/ftrace_32.S +++ b/arch/x86/kernel/ftrace_32.S @@ -3,10 +3,10 @@ * Copyright (C) 2017 Steven Rostedt, VMware Inc. */ +#include #include #include #include -#include #include #include #include diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index 945cfa5..214f30e 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -3,12 +3,12 @@ * Copyright (C) 2014 Steven Rostedt, Red Hat Inc */ +#include #include #include #include #include #include -#include #include #include #include diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index c931899..b655421 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -8,6 +8,7 @@ */ .text +#include #include #include #include @@ -25,7 +26,6 @@ #include #include #include -#include #include /* Physical address */ diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index ea69959..6bbbef6 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -9,7 +9,7 @@ * Copyright (C) 2005 Eric Biederman */ - +#include #include #include #include @@ -22,7 +22,6 @@ #include #include #include "../entry/calling.h" -#include #include #include #include diff --git a/arch/x86/kernel/irqflags.S b/arch/x86/kernel/irqflags.S index aaf9e77..7f542a7 100644 --- a/arch/x86/kernel/irqflags.S +++ b/arch/x86/kernel/irqflags.S @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include -#include +#include #include /* diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S index 23318c3..68f7fa3 100644 --- a/arch/x86/lib/checksum_32.S +++ b/arch/x86/lib/checksum_32.S @@ -21,10 +21,10 @@ * converted to pure assembler */ +#include #include #include #include -#include #include /* diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S index f74a3e7..2760a15 100644 --- a/arch/x86/lib/clear_page_64.S +++ b/arch/x86/lib/clear_page_64.S @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include -#include /* * Most CPUs support enhanced REP MOVSB/STOSB instructions. It is diff --git a/arch/x86/lib/cmpxchg8b_emu.S b/arch/x86/lib/cmpxchg8b_emu.S index 4980525..873e4ef 100644 --- a/arch/x86/lib/cmpxchg8b_emu.S +++ b/arch/x86/lib/cmpxchg8b_emu.S @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include -#include #include #include diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S index 30ea644..d6ae793 100644 --- a/arch/x86/lib/copy_page_64.S +++ b/arch/x86/lib/copy_page_64.S @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Written 2003 by Andi Kleen, based on a kernel by Evandro Menezes */ +#include #include #include #include -#include /* * Some CPUs run faster using the string copy instructions (sane microcode). diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index 0a81aaf..fc9fb5d 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S @@ -6,11 +6,11 @@ * Functions to copy from and to user space. */ +#include #include #include #include #include -#include /* * rep_movs_alternative - memory copy with exception handling. diff --git a/arch/x86/lib/copy_user_uncached_64.S b/arch/x86/lib/copy_user_uncached_64.S index 5c5f38d..2918e36 100644 --- a/arch/x86/lib/copy_user_uncached_64.S +++ b/arch/x86/lib/copy_user_uncached_64.S @@ -3,9 +3,9 @@ * Copyright 2023 Linus Torvalds */ +#include #include #include -#include /* * copy_user_nocache - Uncached memory copy with exception handling diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S index 9c63713..20ef350 100644 --- a/arch/x86/lib/getuser.S +++ b/arch/x86/lib/getuser.S @@ -26,6 +26,7 @@ * as they get called from within inline assembly. */ +#include #include #include #include @@ -33,7 +34,6 @@ #include #include #include -#include #define ASM_BARRIER_NOSPEC ALTERNATIVE "", "lfence", X86_FEATURE_LFENCE_RDTSC diff --git a/arch/x86/lib/hweight.S b/arch/x86/lib/hweight.S index 12c16c6..5e5e9e3 100644 --- a/arch/x86/lib/hweight.S +++ b/arch/x86/lib/hweight.S @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include #include -#include #include diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index 76697df..0ae2e17 100644 --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* Copyright 2002 Andi Kleen */ +#include #include #include #include #include #include -#include .section .noinstr.text, "ax" diff --git a/arch/x86/lib/memmove_32.S b/arch/x86/lib/memmove_32.S index 0588b2c..35010ba 100644 --- a/arch/x86/lib/memmove_32.S +++ b/arch/x86/lib/memmove_32.S @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include #include -#include SYM_FUNC_START(memmove) /* diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S index ccdf3a5..1b60ae8 100644 --- a/arch/x86/lib/memmove_64.S +++ b/arch/x86/lib/memmove_64.S @@ -6,10 +6,10 @@ * This assembly file is re-written from memmove_64.c file. * - Copyright 2011 Fenghua Yu */ +#include #include #include #include -#include #undef memmove diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S index 3d818b8..0199d56 100644 --- a/arch/x86/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2002 Andi Kleen, SuSE Labs */ +#include #include #include #include -#include .section .noinstr.text, "ax" diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S index 235bbda..2877f59 100644 --- a/arch/x86/lib/putuser.S +++ b/arch/x86/lib/putuser.S @@ -11,13 +11,12 @@ * return an error value in addition to the "real" * return value. */ +#include #include #include #include #include #include -#include - /* * __put_user_X diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index cd86aeb..dca34f5 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include #include #include #include #include #include #include -#include #include #include #include