From patchwork Sat Aug 19 23:33:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136215 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2259529vqi; Sat, 19 Aug 2023 17:58:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHniX3LdGXusMW1AZccENW069FQmCuOtcqmtjGwFAKC9UQxWJwZtvkj7Qf1BA35DFXdTqVx X-Received: by 2002:a25:d383:0:b0:d13:5114:101d with SMTP id e125-20020a25d383000000b00d135114101dmr3295709ybf.56.1692493107561; Sat, 19 Aug 2023 17:58:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692493107; cv=none; d=google.com; s=arc-20160816; b=aDUfCs9MzpgsvfJtwQrUVfnQXus40Ml5AA5td3kujGly90JM+ckX9/YsVcySZ4PNMb E6oE4UqALUTbNsG8BF3VO6PRdiKraTPwgeRc/rw+S9NRWKqHbyOO/K7aECkW2Tw90X2F Pvr+xLhhBTC3HkuSPYuwgaHYDK83Tgw4Kd9BlXyDfBU/lUndKwEoyOr6pO518mQKtL2Q t9XSrzVN3XwttKdFUwlWfsCtRtObAsBYqPrrGtX+HwJ0hZcfdC32eZiuY3ucHvR8Thov wfKuExi2BnlK9T3nQouPRzDy/tRD+ULACaBU4UK3r827KXKAc13A1qZmuyPHn3E/b61X IkZA== 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=HiJ7Gyo8DN8yaUqvrq+mz9njb0kToSY8YxhgM5l8WAg=; fh=uUaQOpGfyOD6dne4eQQbSK10+q5U0PyBNlYolP9hmDw=; b=VeqWx/sNmSlmVjZyszM5ZomWp7dq8BL0R5TKHPjZ7W+fsDMdFKp+C3F8NjGJtLvajc aNg84JGwZPieFGCjwa3t0cJ9dc8tCtxTEYlmeMqkhroCw2QTqyibf1QQL55sd1YCsc9f qd0dO1BWOMT8h4X/2RHlwSNc7doGsBI6H4ZPJIl91xbJr8QgKMZxertPA3l0AXS2JaQx NGH63Ix7QislEYLFgeAFolZ1nnWKXeVnJgTZMj5VSAm+/R7paqsbVizu+2fxpaxR93Tm J0VCKQornuWQKLQefc1m3RYPsDAqIeehcaaSKyamox0WJPQAfExsdsSjWVn/g0SZtQ0o tIoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SKWTfiUh; 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 s1-20020a63dc01000000b0056417c8a310si4337337pgg.204.2023.08.19.17.58.14; Sat, 19 Aug 2023 17:58:27 -0700 (PDT) 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=SKWTfiUh; 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 S229729AbjHTAdc (ORCPT + 99 others); Sat, 19 Aug 2023 20:33:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229737AbjHTAdD (ORCPT ); Sat, 19 Aug 2023 20:33:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA21488CDC; Sat, 19 Aug 2023 16:33:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6A1B060B55; Sat, 19 Aug 2023 23:33:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6EAB1C433C7; Sat, 19 Aug 2023 23:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692488037; bh=6UEK89bt2PFewknJ9lYROsEb+cpA3UQvuifqeSZY2fY=; h=From:To:Cc:Subject:Date:From; b=SKWTfiUhTky20tOqgoLoCtRTwhje2c8FDvSmmRDLHMmCcuaUprbq65nE2h6zs7nWG cyROFkHr20F/x8uD6f2CYoVHudT2sGuWv/xi+PjRVplKRW301Jm1MBzHKJiU1hIhSG OMYSvxTuJX1miSqWxybYrz0xd9Ui7lYP3oaiXRTL+gejNpDgiDVqFw5O274eEe7ARY ojYMaj9HhqR9fEOcxMpoS6zs/EPfjhZsiUxc5by7/HOBrusyreU7OznJ/+nuys2zq6 4kb5+KWo/eouaGfWMbczHZTdKkdW6cKOsVRwe1+QBmg6BxkOfcW7pXISIg+RV4LtsG Ugf1z+S7IXaQg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org, Masahiro Yamada , "David S. Miller" , linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH 1/6] sparc: replace #include with #include Date: Sun, 20 Aug 2023 08:33:48 +0900 Message-Id: <20230819233353.3683813-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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: INBOX X-GMAIL-THRID: 1774707652499351075 X-GMAIL-MSGID: 1774707652499351075 Commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost") deprecated , which is now a wrapper of . Replace #include with #include . After all the lines are converted, and will be removed. Signed-off-by: Masahiro Yamada --- arch/sparc/kernel/entry.S | 2 +- arch/sparc/kernel/head_32.S | 2 +- arch/sparc/kernel/head_64.S | 2 +- arch/sparc/lib/U1memcpy.S | 2 +- arch/sparc/lib/VISsave.S | 2 +- arch/sparc/lib/ashldi3.S | 2 +- arch/sparc/lib/ashrdi3.S | 2 +- arch/sparc/lib/atomic_64.S | 2 +- arch/sparc/lib/bitops.S | 2 +- arch/sparc/lib/blockops.S | 2 +- arch/sparc/lib/bzero.S | 2 +- arch/sparc/lib/checksum_32.S | 2 +- arch/sparc/lib/checksum_64.S | 2 +- arch/sparc/lib/clear_page.S | 2 +- arch/sparc/lib/copy_in_user.S | 2 +- arch/sparc/lib/copy_page.S | 2 +- arch/sparc/lib/copy_user.S | 2 +- arch/sparc/lib/csum_copy.S | 2 +- arch/sparc/lib/divdi3.S | 2 +- arch/sparc/lib/ffs.S | 2 +- arch/sparc/lib/fls.S | 2 +- arch/sparc/lib/fls64.S | 2 +- arch/sparc/lib/hweight.S | 2 +- arch/sparc/lib/ipcsum.S | 2 +- arch/sparc/lib/locks.S | 2 +- arch/sparc/lib/lshrdi3.S | 2 +- arch/sparc/lib/mcount.S | 2 +- arch/sparc/lib/memcmp.S | 2 +- arch/sparc/lib/memcpy.S | 3 ++- arch/sparc/lib/memmove.S | 2 +- arch/sparc/lib/memscan_32.S | 2 +- arch/sparc/lib/memscan_64.S | 2 +- arch/sparc/lib/memset.S | 2 +- arch/sparc/lib/muldi3.S | 2 +- arch/sparc/lib/multi3.S | 2 +- arch/sparc/lib/strlen.S | 2 +- arch/sparc/lib/strncmp_32.S | 2 +- arch/sparc/lib/strncmp_64.S | 2 +- arch/sparc/lib/xor.S | 2 +- 39 files changed, 40 insertions(+), 39 deletions(-) diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index a269ad2fe6df..a3fdee4cd6fa 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -8,6 +8,7 @@ * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au) */ +#include #include #include #include @@ -30,7 +31,6 @@ #include #include -#include #define curptr g6 diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S index 6044b82b9767..964c61b5cd03 100644 --- a/arch/sparc/kernel/head_32.S +++ b/arch/sparc/kernel/head_32.S @@ -11,6 +11,7 @@ * CompactPCI platform by Eric Brower, 1999. */ +#include #include #include @@ -25,7 +26,6 @@ #include /* TI_UWINMASK */ #include #include /* PGDIR_SHIFT */ -#include .data /* The following are used with the prom_vector node-ops to figure out diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S index 72a5bdc833ea..cf0549134234 100644 --- a/arch/sparc/kernel/head_64.S +++ b/arch/sparc/kernel/head_64.S @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -33,7 +34,6 @@ #include #include #include -#include /* This section from from _start to sparc64_boot_end should fit into * 0x0000000000404000 to 0x0000000000408000. diff --git a/arch/sparc/lib/U1memcpy.S b/arch/sparc/lib/U1memcpy.S index a6f4ee391897..635398ec7540 100644 --- a/arch/sparc/lib/U1memcpy.S +++ b/arch/sparc/lib/U1memcpy.S @@ -6,10 +6,10 @@ */ #ifdef __KERNEL__ +#include #include #include #include -#include #define GLOBAL_SPARE g7 #else #define GLOBAL_SPARE g5 diff --git a/arch/sparc/lib/VISsave.S b/arch/sparc/lib/VISsave.S index 9c8eb2017d5b..31a0c336c185 100644 --- a/arch/sparc/lib/VISsave.S +++ b/arch/sparc/lib/VISsave.S @@ -7,6 +7,7 @@ * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) */ +#include #include #include @@ -14,7 +15,6 @@ #include #include #include -#include /* On entry: %o5=current FPRS value, %g7 is callers address */ /* May clobber %o5, %g1, %g2, %g3, %g7, %icc, %xcc */ diff --git a/arch/sparc/lib/ashldi3.S b/arch/sparc/lib/ashldi3.S index 2d72de88af90..2a9e7c4fb260 100644 --- a/arch/sparc/lib/ashldi3.S +++ b/arch/sparc/lib/ashldi3.S @@ -6,8 +6,8 @@ * Copyright (C) 1999 David S. Miller (davem@redhat.com) */ +#include #include -#include .text ENTRY(__ashldi3) diff --git a/arch/sparc/lib/ashrdi3.S b/arch/sparc/lib/ashrdi3.S index 05dfda9f5005..8fd0b311722f 100644 --- a/arch/sparc/lib/ashrdi3.S +++ b/arch/sparc/lib/ashrdi3.S @@ -6,8 +6,8 @@ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) */ +#include #include -#include .text ENTRY(__ashrdi3) diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S index 8245d4a97301..4f8cab2fb9cd 100644 --- a/arch/sparc/lib/atomic_64.S +++ b/arch/sparc/lib/atomic_64.S @@ -4,10 +4,10 @@ * Copyright (C) 1999, 2007 2012 David S. Miller (davem@davemloft.net) */ +#include #include #include #include -#include .text diff --git a/arch/sparc/lib/bitops.S b/arch/sparc/lib/bitops.S index 9d647f977618..9c91cbb310e7 100644 --- a/arch/sparc/lib/bitops.S +++ b/arch/sparc/lib/bitops.S @@ -4,10 +4,10 @@ * Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net) */ +#include #include #include #include -#include .text diff --git a/arch/sparc/lib/blockops.S b/arch/sparc/lib/blockops.S index 76ddd1ff6833..5b92959a4d48 100644 --- a/arch/sparc/lib/blockops.S +++ b/arch/sparc/lib/blockops.S @@ -5,9 +5,9 @@ * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) */ +#include #include #include -#include /* Zero out 64 bytes of memory at (buf + offset). * Assumes %g1 contains zero. diff --git a/arch/sparc/lib/bzero.S b/arch/sparc/lib/bzero.S index 87fec4cbe10c..2bfa44a6b25e 100644 --- a/arch/sparc/lib/bzero.S +++ b/arch/sparc/lib/bzero.S @@ -5,8 +5,8 @@ * Copyright (C) 2005 David S. Miller */ +#include #include -#include .text diff --git a/arch/sparc/lib/checksum_32.S b/arch/sparc/lib/checksum_32.S index 781e39b3c009..84ad709cbecb 100644 --- a/arch/sparc/lib/checksum_32.S +++ b/arch/sparc/lib/checksum_32.S @@ -14,8 +14,8 @@ * BSD4.4 portable checksum routine */ +#include #include -#include #define CSUM_BIGCHUNK(buf, offset, sum, t0, t1, t2, t3, t4, t5) \ ldd [buf + offset + 0x00], t0; \ diff --git a/arch/sparc/lib/checksum_64.S b/arch/sparc/lib/checksum_64.S index 9700ef1730df..32b626f3fe4d 100644 --- a/arch/sparc/lib/checksum_64.S +++ b/arch/sparc/lib/checksum_64.S @@ -14,7 +14,7 @@ * BSD4.4 portable checksum routine */ -#include +#include .text csum_partial_fix_alignment: diff --git a/arch/sparc/lib/clear_page.S b/arch/sparc/lib/clear_page.S index 302d3454a994..e63458194f5a 100644 --- a/arch/sparc/lib/clear_page.S +++ b/arch/sparc/lib/clear_page.S @@ -5,13 +5,13 @@ * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com) */ +#include #include #include #include #include #include #include -#include /* What we used to do was lock a TLB entry into a specific * TLB slot, clear the page with interrupts disabled, then diff --git a/arch/sparc/lib/copy_in_user.S b/arch/sparc/lib/copy_in_user.S index 66e90bf528e2..e23e6a69ff92 100644 --- a/arch/sparc/lib/copy_in_user.S +++ b/arch/sparc/lib/copy_in_user.S @@ -4,9 +4,9 @@ * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com) */ +#include #include #include -#include #define XCC xcc diff --git a/arch/sparc/lib/copy_page.S b/arch/sparc/lib/copy_page.S index 5ebcfd479f4f..7a041f3ebc58 100644 --- a/arch/sparc/lib/copy_page.S +++ b/arch/sparc/lib/copy_page.S @@ -5,13 +5,13 @@ * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com) */ +#include #include #include #include #include #include #include -#include /* What we used to do was lock a TLB entry into a specific * TLB slot, clear the page with interrupts disabled, then diff --git a/arch/sparc/lib/copy_user.S b/arch/sparc/lib/copy_user.S index 954572c78539..7bb2ef68881d 100644 --- a/arch/sparc/lib/copy_user.S +++ b/arch/sparc/lib/copy_user.S @@ -12,11 +12,11 @@ * Returns 0 if successful, otherwise count of bytes not copied yet */ +#include #include #include #include #include -#include /* Work around cpp -rob */ #define ALLOC #alloc diff --git a/arch/sparc/lib/csum_copy.S b/arch/sparc/lib/csum_copy.S index d839956407a7..f968e83bc93b 100644 --- a/arch/sparc/lib/csum_copy.S +++ b/arch/sparc/lib/csum_copy.S @@ -4,7 +4,7 @@ * Copyright (C) 2005 David S. Miller */ -#include +#include #ifdef __KERNEL__ #define GLOBAL_SPARE %g7 diff --git a/arch/sparc/lib/divdi3.S b/arch/sparc/lib/divdi3.S index a7389409d9fa..4ba901acd572 100644 --- a/arch/sparc/lib/divdi3.S +++ b/arch/sparc/lib/divdi3.S @@ -5,7 +5,7 @@ This file is part of GNU CC. */ -#include +#include .text .align 4 .globl __divdi3 diff --git a/arch/sparc/lib/ffs.S b/arch/sparc/lib/ffs.S index 5a11d864fa05..3a9ad8ffdfe8 100644 --- a/arch/sparc/lib/ffs.S +++ b/arch/sparc/lib/ffs.S @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include #include -#include .register %g2,#scratch diff --git a/arch/sparc/lib/fls.S b/arch/sparc/lib/fls.S index 06b8d300bcae..ccf97fb7d8cd 100644 --- a/arch/sparc/lib/fls.S +++ b/arch/sparc/lib/fls.S @@ -5,8 +5,8 @@ * and onward. */ +#include #include -#include .text .register %g2, #scratch diff --git a/arch/sparc/lib/fls64.S b/arch/sparc/lib/fls64.S index c83e22ae9586..87005b67d378 100644 --- a/arch/sparc/lib/fls64.S +++ b/arch/sparc/lib/fls64.S @@ -5,8 +5,8 @@ * and onward. */ +#include #include -#include .text .register %g2, #scratch diff --git a/arch/sparc/lib/hweight.S b/arch/sparc/lib/hweight.S index 0ddbbb031822..eebee59b0655 100644 --- a/arch/sparc/lib/hweight.S +++ b/arch/sparc/lib/hweight.S @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include #include -#include .text .align 32 diff --git a/arch/sparc/lib/ipcsum.S b/arch/sparc/lib/ipcsum.S index 531d89c9d5d9..7fa8fd4b795a 100644 --- a/arch/sparc/lib/ipcsum.S +++ b/arch/sparc/lib/ipcsum.S @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include #include -#include .text ENTRY(ip_fast_csum) /* %o0 = iph, %o1 = ihl */ diff --git a/arch/sparc/lib/locks.S b/arch/sparc/lib/locks.S index 9a1289a3fb28..47a39f4384a2 100644 --- a/arch/sparc/lib/locks.S +++ b/arch/sparc/lib/locks.S @@ -7,11 +7,11 @@ * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) */ +#include #include #include #include #include -#include .text .align 4 diff --git a/arch/sparc/lib/lshrdi3.S b/arch/sparc/lib/lshrdi3.S index 509ca6682da8..09bf581a0ba5 100644 --- a/arch/sparc/lib/lshrdi3.S +++ b/arch/sparc/lib/lshrdi3.S @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include #include -#include ENTRY(__lshrdi3) cmp %o2, 0 diff --git a/arch/sparc/lib/mcount.S b/arch/sparc/lib/mcount.S index deba6fa0bc78..f7f7910eb41e 100644 --- a/arch/sparc/lib/mcount.S +++ b/arch/sparc/lib/mcount.S @@ -6,8 +6,8 @@ * This can also be tweaked for kernel stack overflow detection. */ +#include #include -#include /* * This is the main variant and is called by C code. GCC's -pg option diff --git a/arch/sparc/lib/memcmp.S b/arch/sparc/lib/memcmp.S index a18076ef5af1..c87e8000feba 100644 --- a/arch/sparc/lib/memcmp.S +++ b/arch/sparc/lib/memcmp.S @@ -5,9 +5,9 @@ * Copyright (C) 2000, 2008 David S. Miller (davem@davemloft.net) */ +#include #include #include -#include .text ENTRY(memcmp) diff --git a/arch/sparc/lib/memcpy.S b/arch/sparc/lib/memcpy.S index ee823d8c9215..57b1ae0f5924 100644 --- a/arch/sparc/lib/memcpy.S +++ b/arch/sparc/lib/memcpy.S @@ -8,7 +8,8 @@ * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz) */ -#include +#include + #define FUNC(x) \ .globl x; \ .type x,@function; \ diff --git a/arch/sparc/lib/memmove.S b/arch/sparc/lib/memmove.S index 3132b6316144..543dda7b9dac 100644 --- a/arch/sparc/lib/memmove.S +++ b/arch/sparc/lib/memmove.S @@ -5,8 +5,8 @@ * Copyright (C) 1996, 1997, 1998, 1999 Jakub Jelinek (jj@ultra.linux.cz) */ +#include #include -#include .text ENTRY(memmove) /* o0=dst o1=src o2=len */ diff --git a/arch/sparc/lib/memscan_32.S b/arch/sparc/lib/memscan_32.S index c4c2d5b3a2e9..5386a3a20019 100644 --- a/arch/sparc/lib/memscan_32.S +++ b/arch/sparc/lib/memscan_32.S @@ -5,7 +5,7 @@ * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) */ -#include +#include /* In essence, this is just a fancy strlen. */ diff --git a/arch/sparc/lib/memscan_64.S b/arch/sparc/lib/memscan_64.S index 36dd638905c3..70a4f21057f2 100644 --- a/arch/sparc/lib/memscan_64.S +++ b/arch/sparc/lib/memscan_64.S @@ -6,7 +6,7 @@ * Copyright (C) 1998 David S. Miller (davem@redhat.com) */ - #include +#include #define HI_MAGIC 0x8080808080808080 #define LO_MAGIC 0x0101010101010101 diff --git a/arch/sparc/lib/memset.S b/arch/sparc/lib/memset.S index eaff68213fdf..a33419dbb464 100644 --- a/arch/sparc/lib/memset.S +++ b/arch/sparc/lib/memset.S @@ -9,8 +9,8 @@ * clear_user. */ +#include #include -#include /* Work around cpp -rob */ #define ALLOC #alloc diff --git a/arch/sparc/lib/muldi3.S b/arch/sparc/lib/muldi3.S index 53054dee66d6..7e1e8cd30a22 100644 --- a/arch/sparc/lib/muldi3.S +++ b/arch/sparc/lib/muldi3.S @@ -5,7 +5,7 @@ This file is part of GNU CC. */ -#include +#include .text .align 4 .globl __muldi3 diff --git a/arch/sparc/lib/multi3.S b/arch/sparc/lib/multi3.S index 2f187b299345..5bb4c122a2cf 100644 --- a/arch/sparc/lib/multi3.S +++ b/arch/sparc/lib/multi3.S @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include #include -#include .text .align 4 diff --git a/arch/sparc/lib/strlen.S b/arch/sparc/lib/strlen.S index dd111bbad5df..27478b3f1647 100644 --- a/arch/sparc/lib/strlen.S +++ b/arch/sparc/lib/strlen.S @@ -6,9 +6,9 @@ * Copyright (C) 1996, 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) */ +#include #include #include -#include #define LO_MAGIC 0x01010101 #define HI_MAGIC 0x80808080 diff --git a/arch/sparc/lib/strncmp_32.S b/arch/sparc/lib/strncmp_32.S index 794733f036b6..387bbf621548 100644 --- a/arch/sparc/lib/strncmp_32.S +++ b/arch/sparc/lib/strncmp_32.S @@ -4,8 +4,8 @@ * generic strncmp routine. */ +#include #include -#include .text ENTRY(strncmp) diff --git a/arch/sparc/lib/strncmp_64.S b/arch/sparc/lib/strncmp_64.S index 3d37d65f674c..76c1207ecf5a 100644 --- a/arch/sparc/lib/strncmp_64.S +++ b/arch/sparc/lib/strncmp_64.S @@ -5,9 +5,9 @@ * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) */ +#include #include #include -#include .text ENTRY(strncmp) diff --git a/arch/sparc/lib/xor.S b/arch/sparc/lib/xor.S index f6af7c7ee6fc..35461e3b2a9b 100644 --- a/arch/sparc/lib/xor.S +++ b/arch/sparc/lib/xor.S @@ -9,12 +9,12 @@ * Copyright (C) 2006 David S. Miller */ +#include #include #include #include #include #include -#include /* * Requirements: From patchwork Sat Aug 19 23:33:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136226 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2329647vqi; Sat, 19 Aug 2023 22:42:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFo3laQEyd99o/qpkiHC6YNcZrLuBwQHGC7/ERuNTbT5PDr9xd3W4VL8J/E7rxXvyuJem+s X-Received: by 2002:a17:902:f684:b0:1bf:205e:fe5d with SMTP id l4-20020a170902f68400b001bf205efe5dmr5063898plg.7.1692510158094; Sat, 19 Aug 2023 22:42:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692510158; cv=none; d=google.com; s=arc-20160816; b=u76J0xJt3We5JreO7+IKewNLKiuheGxrcZA2+Sd9BAcM/lyZif8l7N3Ypwu1QxhSzU DdIkvuNNp4QKSeGJcwB8NoVWXTgUe7/ggbuBPgrHZLHvmwQ7PsS2pgA5lprqkwu2te0l NQqhIazxen1qR8dGsSKFg64OJH/SqMkbEDjnTqo7z0i7umVtphNM3Nifi8GTSXdr5GPB sG+8OiARLWMyBA70MxHbHBtZN/wHupjNJojqm1BN23YoMTm0DjX+DNWt/AQ/MsvmLGes lv+zE9DOCtZk2oF+gFkLpZ/z2J3qXpkQfXOS9by6GKMc6LupOnq3sujtsUZN2lGnQjcZ aBhw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KaxroNp7zQpKN39q5fcs7EvE9t/4pOnmud6jn2V2kpE=; fh=uUaQOpGfyOD6dne4eQQbSK10+q5U0PyBNlYolP9hmDw=; b=jxPPeHWSRE+TU65/b9x7u5DfTavj9llU5hUlylhH2cnKCEwixSvqYn9IVwOHfGTluo Cs41MyKmj/xEXu/FtBV5hSf9GwfpDXO3EmAbhQUKzxgt0ud3Egfy+ImfEbQlJ4Iq2i9A 2veIRo/LocfBPUEQpW0DhpvyidscREUZoEovdovBdFC7kJmCbS5NyiivNQj/n2UbigY+ oQHnt9T2/nJ2VCurPIHf5ObwIq3OB77NSeVCEBsUiBB0wFlbwzXkT1VYlv4wuiqn8YMg iGjwnb1pvp2GaeusoONY2O3ly6Zz6EdYKlXsS8Uj05WzjIStr0AmVTpoy9TDRfUu8biR xigA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KoJAUpaF; 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 m1-20020a170902d18100b001a6bb7b7a44si4327782plb.307.2023.08.19.22.42.25; Sat, 19 Aug 2023 22:42:38 -0700 (PDT) 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=KoJAUpaF; 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 S229789AbjHTAdf (ORCPT + 99 others); Sat, 19 Aug 2023 20:33:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229739AbjHTAdE (ORCPT ); Sat, 19 Aug 2023 20:33:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A3F588CE3; Sat, 19 Aug 2023 16:34:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 20EFC61A5C; Sat, 19 Aug 2023 23:34:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28F61C433C8; Sat, 19 Aug 2023 23:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692488039; bh=4VzbJWu0rbStCIefyliBH7r4pYxLYwp8vFj3ogFCqcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KoJAUpaFKjfbZ6eNv6DQ0iZJIAn6zSR6nTmV3EFVcSvnG4u/dzDrcD0G8Y1nlqY8U aqAfxOwkm4hTJLasNPlEB6Cr/Gz23fxUSbmNvaRyYruedN9obQ1opM3AZe3JAnF7Af PfNfDdixHTO0ID0wR7UTFOzjousXzkSLNITMZ3Pw97QDpoem3PdB2B7STm39Ewz/Mx 6B1jL0ADsgJppaIRhQO/24TkRDvK2lhhK6IWtNbjv69LwImZvjrhvxGFUHLYsiHhaq pZfngiVWeTa5Uh02dG6QnUTJF5S7UWGy5tHdPZAWaFnms1s2Y7QzvBdzDAoU0zkqu2 ULn7K5wJ0f9Xw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org, Masahiro Yamada , "David S. Miller" , linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH 2/6] sparc: remove Date: Sun, 20 Aug 2023 08:33:49 +0900 Message-Id: <20230819233353.3683813-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230819233353.3683813-1-masahiroy@kernel.org> References: <20230819233353.3683813-1-masahiroy@kernel.org> 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: INBOX X-GMAIL-THRID: 1774725531694443144 X-GMAIL-MSGID: 1774725531694443144 All *.S files under arch/sparc/ have been converted to include instead of . Remove . Signed-off-by: Masahiro Yamada --- arch/sparc/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index 595ca0be286b..43b0ae4c2c21 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild @@ -2,6 +2,5 @@ generated-y += syscall_table_32.h generated-y += syscall_table_64.h generic-y += agp.h -generic-y += export.h generic-y += kvm_para.h generic-y += mcs_spinlock.h From patchwork Sat Aug 19 23:33:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136220 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2274679vqi; Sat, 19 Aug 2023 18:58:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAj410IlPGEWp5O289Kf+4ziQYKdqUS5H1fjDQ7abxL35RE4R80RpefkVGDnIvqmSMvkD4 X-Received: by 2002:a17:902:ee4c:b0:1bf:4e9d:8fd2 with SMTP id 12-20020a170902ee4c00b001bf4e9d8fd2mr2956251plo.67.1692496713535; Sat, 19 Aug 2023 18:58:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692496713; cv=none; d=google.com; s=arc-20160816; b=q31kGJ6Pe3aE73MAdtMmPxbpMMqgN1IkGEn6j3K4839tlqwkBpESNDzBWhF7eU9psT GCDM1RbtYw3/CmN3TemPWT0y8Fbanp8eG3ttglXW/AhO3prT0WLvfz+WJTTXxXi0hLaf 9yhckDtN51OmvDfcnoQUsHfLAlSyMRU5rzJrg9Skj/KLD0UtrLzsmEAKHHP7beh4nJIj 8zgWUutPO8siloLBGOygHyxa4pBhG4BwhgDCo3N9+0tADlwH7DP2MK8U/4fdVLO09BdF FQ5scQIhg86dM+RYb4q2XylqpdpDC46pPqOcd9tkyDHKtEV7cz//7AQKt7dvnd4a/XjU pZBQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ObfljVmkQstRkZNiVqPGIdapS/ONaE+ctZNCB81dTok=; fh=iAic+etWnCnsikO3+1o6YCr1RRDpf45iubA4wzIhQHQ=; b=PtBIu2yQp6sPWF2LJWk5v2VQmO/OEiDiEAjbMSvgbzoCNbzlGZ8bqSHEAlJnXyoDpg RyRJ+VVvrh5GcIX+5VfIuDc0BbJbhcYkLwWrgFGqewetMvRqTfZFEQCtOF2Q+p0MBg5w 3kxSx/P+7Marh35pRrIAqnzdvnYnNPVW+aqSGtYaxg1/TfzUQsXGiiWnkyL3ANo0mjQj 5G21qsEDz+W3SLhr7YsV3ieYAoJmBCPbg40uRR6Afje6cDLUIsK/JGqI89y5XXB0lR3l Z9zOYmNlZtwPAny463+tJkTJd4UrlLoFP71ljLBz6bg/9PT6iSF8suvEsYVZLjXRIqti uVGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DKO9KLcy; 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 z15-20020a1709027e8f00b001bf741231f7si543211pla.570.2023.08.19.18.58.19; Sat, 19 Aug 2023 18:58:33 -0700 (PDT) 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=DKO9KLcy; 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 S229627AbjHTASA (ORCPT + 99 others); Sat, 19 Aug 2023 20:18:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229674AbjHTAR5 (ORCPT ); Sat, 19 Aug 2023 20:17:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1523488CE9; Sat, 19 Aug 2023 16:34:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A929661A5C; Sat, 19 Aug 2023 23:34:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0238DC433CA; Sat, 19 Aug 2023 23:33:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692488041; bh=JFhA8y871vv+gRtTcPjd9V7hXE56sCKpW0Vj8S1748E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DKO9KLcyBESyHV5iuYqMVkQhzDHq8YAPi1uEoCKavq2tdIxRG1lOlcpEZty1plKYK cvjDXVhm0Q+9efwybvbdTRJa9sSR+t7W6jT4CulLPJcuEOJezK0zQvjmrmk9zJmDdE OIThQhaGtDa9lmsMo7ciFoLBZvkYzr7cdsKMx6rrs1b+Hr+VelhUQpANV4/jILNd8K SetHh7xHsayX62uCNaSnZ9o/rZ/IhwvYqOwLU+U9SCfvCP6x3pftrHIZNbamnCHb68 YDbY3BFle/2KkzG8Ubxd/Xf4TiKa9yPBoN0Y29dlW5IAUZmJeb27euy7QXuEYzd5ZG XcFEV2p3pWgzA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org, Masahiro Yamada , linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/6] ia64: replace #include with #include Date: Sun, 20 Aug 2023 08:33:50 +0900 Message-Id: <20230819233353.3683813-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230819233353.3683813-1-masahiroy@kernel.org> References: <20230819233353.3683813-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1774711433913081684 X-GMAIL-MSGID: 1774711433913081684 Commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost") deprecated , which is now a wrapper of . Replace #include with #include . After all the lines are converted, and will be removed. Signed-off-by: Masahiro Yamada --- arch/ia64/kernel/entry.S | 3 +-- arch/ia64/kernel/esi_stub.S | 2 +- arch/ia64/kernel/head.S | 3 +-- arch/ia64/kernel/ivt.S | 3 +-- arch/ia64/kernel/pal.S | 2 +- arch/ia64/lib/clear_page.S | 2 +- arch/ia64/lib/clear_user.S | 2 +- arch/ia64/lib/copy_page.S | 2 +- arch/ia64/lib/copy_page_mck.S | 2 +- arch/ia64/lib/copy_user.S | 2 +- arch/ia64/lib/flush.S | 3 +-- arch/ia64/lib/idiv32.S | 2 +- arch/ia64/lib/idiv64.S | 2 +- arch/ia64/lib/ip_fast_csum.S | 2 +- arch/ia64/lib/memcpy.S | 2 +- arch/ia64/lib/memcpy_mck.S | 2 +- arch/ia64/lib/memset.S | 2 +- arch/ia64/lib/strlen.S | 2 +- arch/ia64/lib/strncpy_from_user.S | 2 +- arch/ia64/lib/strnlen_user.S | 2 +- arch/ia64/lib/xor.S | 2 +- 21 files changed, 21 insertions(+), 25 deletions(-) diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 5eba3fb2e311..ac06d44b9b27 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -37,7 +37,7 @@ * pNonSys: !pSys */ - +#include #include #include #include @@ -49,7 +49,6 @@ #include #include #include -#include #include "minstate.h" diff --git a/arch/ia64/kernel/esi_stub.S b/arch/ia64/kernel/esi_stub.S index 821e68d10598..9928c5b2957c 100644 --- a/arch/ia64/kernel/esi_stub.S +++ b/arch/ia64/kernel/esi_stub.S @@ -34,9 +34,9 @@ #define PSR_BITS_TO_SET \ (IA64_PSR_BN) +#include #include #include -#include /* * Inputs: diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S index c096500590e9..85c8a57da402 100644 --- a/arch/ia64/kernel/head.S +++ b/arch/ia64/kernel/head.S @@ -20,7 +20,7 @@ * Support for CPU Hotplug */ - +#include #include #include #include @@ -33,7 +33,6 @@ #include #include #include -#include #ifdef CONFIG_HOTPLUG_CPU #define SAL_PSR_BITS_TO_SET \ diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S index 7a418e324d30..da90c49df628 100644 --- a/arch/ia64/kernel/ivt.S +++ b/arch/ia64/kernel/ivt.S @@ -47,7 +47,7 @@ * Table is based upon EAS2.6 (Oct 1999) */ - +#include #include #include #include @@ -58,7 +58,6 @@ #include #include #include -#include #if 0 # define PSR_DEFAULT_BITS psr.ac diff --git a/arch/ia64/kernel/pal.S b/arch/ia64/kernel/pal.S index 06d01a070aae..fb6db6966f70 100644 --- a/arch/ia64/kernel/pal.S +++ b/arch/ia64/kernel/pal.S @@ -13,9 +13,9 @@ * 05/24/2000 eranian Added support for physical mode static calls */ +#include #include #include -#include .data pal_entry_point: diff --git a/arch/ia64/lib/clear_page.S b/arch/ia64/lib/clear_page.S index 65b75085c8f4..ba0dd2538fa5 100644 --- a/arch/ia64/lib/clear_page.S +++ b/arch/ia64/lib/clear_page.S @@ -10,9 +10,9 @@ * 3/08/02 davidm Some more tweaking */ +#include #include #include -#include #ifdef CONFIG_ITANIUM # define L3_LINE_SIZE 64 // Itanium L3 line size diff --git a/arch/ia64/lib/clear_user.S b/arch/ia64/lib/clear_user.S index a28f39d349eb..1d9e45ccf8e5 100644 --- a/arch/ia64/lib/clear_user.S +++ b/arch/ia64/lib/clear_user.S @@ -12,8 +12,8 @@ * Stephane Eranian */ +#include #include -#include // // arguments diff --git a/arch/ia64/lib/copy_page.S b/arch/ia64/lib/copy_page.S index 176f857c522e..c0a0e6b2af00 100644 --- a/arch/ia64/lib/copy_page.S +++ b/arch/ia64/lib/copy_page.S @@ -15,9 +15,9 @@ * * 4/06/01 davidm Tuned to make it perform well both for cached and uncached copies. */ +#include #include #include -#include #define PIPE_DEPTH 3 #define EPI p[PIPE_DEPTH-1] diff --git a/arch/ia64/lib/copy_page_mck.S b/arch/ia64/lib/copy_page_mck.S index d6fd56e4f1c1..5e8bb4b4b535 100644 --- a/arch/ia64/lib/copy_page_mck.S +++ b/arch/ia64/lib/copy_page_mck.S @@ -60,9 +60,9 @@ * to fetch the second-half of the L2 cache line into L1, and the tX words are copied in * an order that avoids bank conflicts. */ +#include #include #include -#include #define PREFETCH_DIST 8 // McKinley sustains 16 outstanding L2 misses (8 ld, 8 st) diff --git a/arch/ia64/lib/copy_user.S b/arch/ia64/lib/copy_user.S index f681556c6b86..8daab72cfe77 100644 --- a/arch/ia64/lib/copy_user.S +++ b/arch/ia64/lib/copy_user.S @@ -30,8 +30,8 @@ * - fix extraneous stop bit introduced by the EX() macro. */ +#include #include -#include // // Tuneable parameters diff --git a/arch/ia64/lib/flush.S b/arch/ia64/lib/flush.S index 8573d59c9ed1..f8e795fe45cb 100644 --- a/arch/ia64/lib/flush.S +++ b/arch/ia64/lib/flush.S @@ -8,9 +8,8 @@ * 05/28/05 Zoltan Menyhart Dynamic stride size */ +#include #include -#include - /* * flush_icache_range(start,end) diff --git a/arch/ia64/lib/idiv32.S b/arch/ia64/lib/idiv32.S index def92b708e6e..83586fbc51ff 100644 --- a/arch/ia64/lib/idiv32.S +++ b/arch/ia64/lib/idiv32.S @@ -15,8 +15,8 @@ * (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions) */ +#include #include -#include #ifdef MODULO # define OP mod diff --git a/arch/ia64/lib/idiv64.S b/arch/ia64/lib/idiv64.S index a8ba3bd3d4d8..5c9113691f72 100644 --- a/arch/ia64/lib/idiv64.S +++ b/arch/ia64/lib/idiv64.S @@ -15,8 +15,8 @@ * (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions) */ +#include #include -#include #ifdef MODULO # define OP mod diff --git a/arch/ia64/lib/ip_fast_csum.S b/arch/ia64/lib/ip_fast_csum.S index dc9e6e6fe876..fcc0b812ce2e 100644 --- a/arch/ia64/lib/ip_fast_csum.S +++ b/arch/ia64/lib/ip_fast_csum.S @@ -13,8 +13,8 @@ * Copyright (C) 2002, 2006 Ken Chen */ +#include #include -#include /* * Since we know that most likely this function is called with buf aligned diff --git a/arch/ia64/lib/memcpy.S b/arch/ia64/lib/memcpy.S index 91a625fddbf0..35c9069a8345 100644 --- a/arch/ia64/lib/memcpy.S +++ b/arch/ia64/lib/memcpy.S @@ -14,8 +14,8 @@ * Stephane Eranian * David Mosberger-Tang */ +#include #include -#include GLOBAL_ENTRY(memcpy) diff --git a/arch/ia64/lib/memcpy_mck.S b/arch/ia64/lib/memcpy_mck.S index cc4e6ac914b6..c0d4362217ae 100644 --- a/arch/ia64/lib/memcpy_mck.S +++ b/arch/ia64/lib/memcpy_mck.S @@ -14,9 +14,9 @@ * Copyright (C) 2002 Intel Corp. * Copyright (C) 2002 Ken Chen */ +#include #include #include -#include #define EK(y...) EX(y) diff --git a/arch/ia64/lib/memset.S b/arch/ia64/lib/memset.S index 07a8b92c6496..552c5c7e4d06 100644 --- a/arch/ia64/lib/memset.S +++ b/arch/ia64/lib/memset.S @@ -18,8 +18,8 @@ Since a stf.spill f0 can store 16B in one go, we use this instruction to get peak speed when value = 0. */ +#include #include -#include #undef ret #define dest in0 diff --git a/arch/ia64/lib/strlen.S b/arch/ia64/lib/strlen.S index d66de5966974..1f4a46c15127 100644 --- a/arch/ia64/lib/strlen.S +++ b/arch/ia64/lib/strlen.S @@ -17,8 +17,8 @@ * 09/24/99 S.Eranian add speculation recovery code */ +#include #include -#include // // diff --git a/arch/ia64/lib/strncpy_from_user.S b/arch/ia64/lib/strncpy_from_user.S index 49eb81b69cd2..a287169bd953 100644 --- a/arch/ia64/lib/strncpy_from_user.S +++ b/arch/ia64/lib/strncpy_from_user.S @@ -17,8 +17,8 @@ * by Andreas Schwab ). */ +#include #include -#include GLOBAL_ENTRY(__strncpy_from_user) alloc r2=ar.pfs,3,0,0,0 diff --git a/arch/ia64/lib/strnlen_user.S b/arch/ia64/lib/strnlen_user.S index 4b684d4da106..a7eb56e840a9 100644 --- a/arch/ia64/lib/strnlen_user.S +++ b/arch/ia64/lib/strnlen_user.S @@ -13,8 +13,8 @@ * Copyright (C) 1999, 2001 David Mosberger-Tang */ +#include #include -#include GLOBAL_ENTRY(__strnlen_user) .prologue diff --git a/arch/ia64/lib/xor.S b/arch/ia64/lib/xor.S index 5413dafe6b2e..6e2a69662c06 100644 --- a/arch/ia64/lib/xor.S +++ b/arch/ia64/lib/xor.S @@ -5,8 +5,8 @@ * Optimized RAID-5 checksumming functions for IA-64. */ +#include #include -#include GLOBAL_ENTRY(xor_ia64_2) .prologue From patchwork Sat Aug 19 23:33:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2259761vqi; Sat, 19 Aug 2023 17:59:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+MhycuY3qypm3Y4T+WW1qJAUz1HHefk4F+UrVIDCmLoRRy4FvfGKH6a/lH2TxLEzZCgIA X-Received: by 2002:a05:620a:17aa:b0:765:3e03:10db with SMTP id ay42-20020a05620a17aa00b007653e0310dbmr4258480qkb.48.1692493173398; Sat, 19 Aug 2023 17:59:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692493173; cv=none; d=google.com; s=arc-20160816; b=W/4qnZS/0EnD8B9pQgxuNJI7LZ7JSiHWRoMzQp7uAOnc5cJvqfZeJCKg0cow5+S+Js IfIcDm4H3f9fkWarWwv0Ng1BpMG+FerXpNKth7xJ60RwTLGa5eqZDUpvZWZbPaVLmior L/UTMgW84stkkT4hKHVDPknQoalSwL++HlKUpVaPbwCjtiRIo//5d27BaT2jJYs46sq9 8yznGeVz2YcDbUhPMzyojAbFK3+cOM8V1tRLKBH9ZeRYjqM63tBfdWZYSuhfWKRxhOUW SrUo9Fq/8PY6GuIPJl2y9UG9266MbM6nuIpHWeaOiBpl8dvaPk74VmRIhG0QI5uDekFP p6WQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rXo6mqjs9RPdVTulLVK1iu8fgmQnHdBM2qJ2RFtCFHo=; fh=iAic+etWnCnsikO3+1o6YCr1RRDpf45iubA4wzIhQHQ=; b=O5PvrkeXtZ9+h+Izi2hyOwB0aZtB8CbsgjmmobWrZ0taVvZzSDNIo9eOZqWbJ+Nx50 zzs+diTkbrKTMQ+pGK5MzZHhyu1vuXQ4MWpopypc2/I3yR2VlnPOxh5VW8ezPW0QnNkM vFvjtnf0tE2khYsdNhPsh8SgQtwq9qyT2EXXLZxaBuTdlkVe3KuIjq2Ujlwt1umyPL37 Jk/XiXIpodU/MnkTTdGfTY74VVaoWBxhNxWDTZ73X1s7aOTjBlmmj+4X6zE+FLDf/FdU scqz3gHnGJMWKzDgF8VNeA1zt5mPpiY+l74B5eksaf7TJaYe9NPewqEK1ri4CI7fm28x Wn7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iwhxDMVr; 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 e11-20020a65678b000000b00564a033fb0csi4100029pgr.569.2023.08.19.17.59.19; Sat, 19 Aug 2023 17:59:33 -0700 (PDT) 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=iwhxDMVr; 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 S229766AbjHTAde (ORCPT + 99 others); Sat, 19 Aug 2023 20:33:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229743AbjHTAdF (ORCPT ); Sat, 19 Aug 2023 20:33:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F72188CF4; Sat, 19 Aug 2023 16:34:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5F26261A60; Sat, 19 Aug 2023 23:34:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84FE2C433C8; Sat, 19 Aug 2023 23:34:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692488042; bh=nIfDO5AJtyTcclk+tlfLVxSChbajrljmwnUClALdUiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iwhxDMVrzGufl+ixJQKMhyTnX23HBwjB6h5t1xAGlTU8wwL2WiNTgGnCcROe+OykL tF8d2Cr/akJbQv1jYHqQchg7Y99XZXP56OI5D0OCx9XzHmOTCoBcdHzIWJnfsTwNDA raw+RvcJMyha9xPI/46eXKXdIvTVop59G+EEW0BUYcCkqSdMqQYBA5/lptUafTNta5 baHBu0m6pe/5uz3i5g8I6BtObpQsjwJW11Sd8iSG0fnwLfHORnrzD2XUGFeVO15zQm RZRHGtISyt1Tfc1UCZJ00scvKc1Mi8BsYTg2KrfEymLzMH5V8ZC6u+7/zwpFtsMism sU0fZl4rAV/ZQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org, Masahiro Yamada , linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] ia64: remove Date: Sun, 20 Aug 2023 08:33:51 +0900 Message-Id: <20230819233353.3683813-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230819233353.3683813-1-masahiroy@kernel.org> References: <20230819233353.3683813-1-masahiroy@kernel.org> 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: INBOX X-GMAIL-THRID: 1774707722157322864 X-GMAIL-MSGID: 1774707722157322864 All *.S files under arch/ia64/ have been converted to include instead of . Remove . Signed-off-by: Masahiro Yamada --- arch/ia64/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index 33733245f42b..aefae2efde9f 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 generated-y += syscall_table.h generic-y += agp.h -generic-y += export.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += vtime.h From patchwork Sat Aug 19 23:33:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136216 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2259530vqi; Sat, 19 Aug 2023 17:58:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGerZ+T0gV6x7KjHc0sfp9kGaRp/5UdKSOgRwnCVex/dbQWuJYtCAIzDlfBIwVBQD/xLtt X-Received: by 2002:aca:1c15:0:b0:3a7:7559:ff4f with SMTP id c21-20020aca1c15000000b003a77559ff4fmr3235288oic.59.1692493107717; Sat, 19 Aug 2023 17:58:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692493107; cv=none; d=google.com; s=arc-20160816; b=oHxU6tIvq1Z3gF27jVXbLNTIXiyjfVJdPe7ZiNuMaxLJGmjDpq3oyAfua4cKclJ/VQ xWocA4u9RSbO3hTZOWvhvX2qZg0+j0dikEpAQkHJveugt0HuK4JgmRW3Sw4t+4TFGHAw AF0glhmoESaLA4zLKefL0joTYgmpZLgWXqZjOYi/bch0I/cY4cUvy+BXRTqKaKb8hoIr zB0tKB4D172eZW90WXGvDe9kEXuoUQ8FWKGvlrhICyWoT6wIBzIR/n8sflvhEzbatBUa 27gMiIQldDHF5iXxFVeNp2SQrXxxgszXKqRoIp5VJLsTAbHZ3Z9zrXLb7P3mkYZT8iPr 58jg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Fdb889ubpiDeieXZ6I+2agsEjDsE/VsGs8NsUAJUdIs=; fh=x/a+U7MCyNIry9LPNTn5W2RFJtXjzHox1RyHxhDhSk4=; b=O/10W7FGH1AX0KboMkrh0wRvR40wELTdneETBlxm0isyh+zXP9NmlrdHceZl9XnCB7 k6uWbsMNvywJY3Hy1LVDJimrY4+prTuxuj/eJ0/57TdBRWz4tLEEjN2t3xXNdwMKpuqe KD7BwVL71QRqX8IuOorvt5ynIFmTwnNDaB4X1PgXg9Bowf2JnAfZRGMpYlSb0+bXNSFu jnTW2htA9XDaVaoxCyeinLMctBo87EsBPEwSBWj4F/DXTxNH7+DEy/4PqHL94VJUte0k 3JkA2zLM2YCZtSxP+gC+61BcZ67U/dk2a5evtdRtxk8QKybsqMwImZ+ikzl2DZK5hlMZ H6Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GHhf4G+M; 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 dc4-20020a056a0035c400b00687071384a7si4166390pfb.152.2023.08.19.17.58.14; Sat, 19 Aug 2023 17:58:27 -0700 (PDT) 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=GHhf4G+M; 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 S229740AbjHTAd3 (ORCPT + 99 others); Sat, 19 Aug 2023 20:33:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbjHTAdF (ORCPT ); Sat, 19 Aug 2023 20:33:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A18988CFF; Sat, 19 Aug 2023 16:34:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9674661A60; Sat, 19 Aug 2023 23:34:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45F34C433CA; Sat, 19 Aug 2023 23:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692488045; bh=lt/GC4mCVAMEOFC6vz52R8BufOYglMdi+DS9TWA5anE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GHhf4G+MLlj1i1sG/4zzwM4o990LTC4QdjcP52gvXw82tnRQs2FOApLWMH61HofB4 GTUdMCz/kIB8p79EfvYQdZaKptzC3nss0d0ixSU4t5I0sP1Hh4H24hoGQE5cqvcSdC uP6xvrd2SV+G9VfDTm/UJ1GtjIs0wwnxQ8RTz4HPM3p8zcUPh9ues5jm0hLp0axuPZ L+eqDPpBWMbmuy9XJlGjhUmPpAVE8MQ7BJNhInKPgTqrmqmMhU2fxKotlGAc0FvdQN S1nSv73ECmoSAzlQRi2irEWt8/n/JNNE8tKspSw8sJ83hfj1JaAu5I6SMO0HxW2iWT 1t47VyzN+yQUg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org, Masahiro Yamada , Ivan Kokshaysky , Matt Turner , Richard Henderson , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] alpha: replace #include with #include Date: Sun, 20 Aug 2023 08:33:52 +0900 Message-Id: <20230819233353.3683813-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230819233353.3683813-1-masahiroy@kernel.org> References: <20230819233353.3683813-1-masahiroy@kernel.org> 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: INBOX X-GMAIL-THRID: 1774707652585436227 X-GMAIL-MSGID: 1774707652585436227 Commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost") deprecated , which is now a wrapper of . Replace #include with #include . After all the lines are converted, and will be removed. Signed-off-by: Masahiro Yamada --- arch/alpha/lib/callback_srm.S | 2 +- arch/alpha/lib/clear_page.S | 2 +- arch/alpha/lib/clear_user.S | 2 +- arch/alpha/lib/copy_page.S | 2 +- arch/alpha/lib/copy_user.S | 2 +- arch/alpha/lib/csum_ipv6_magic.S | 2 +- arch/alpha/lib/divide.S | 2 +- arch/alpha/lib/ev6-clear_page.S | 2 +- arch/alpha/lib/ev6-clear_user.S | 2 +- arch/alpha/lib/ev6-copy_page.S | 2 +- arch/alpha/lib/ev6-copy_user.S | 2 +- arch/alpha/lib/ev6-csum_ipv6_magic.S | 2 +- arch/alpha/lib/ev6-divide.S | 2 +- arch/alpha/lib/ev6-memchr.S | 2 +- arch/alpha/lib/ev6-memcpy.S | 2 +- arch/alpha/lib/ev6-memset.S | 2 +- arch/alpha/lib/ev67-strcat.S | 2 +- arch/alpha/lib/ev67-strchr.S | 2 +- arch/alpha/lib/ev67-strlen.S | 2 +- arch/alpha/lib/ev67-strncat.S | 2 +- arch/alpha/lib/ev67-strrchr.S | 2 +- arch/alpha/lib/memchr.S | 2 +- arch/alpha/lib/memmove.S | 2 +- arch/alpha/lib/memset.S | 2 +- arch/alpha/lib/strcat.S | 2 +- arch/alpha/lib/strchr.S | 2 +- arch/alpha/lib/strcpy.S | 2 +- arch/alpha/lib/strlen.S | 2 +- arch/alpha/lib/strncat.S | 2 +- arch/alpha/lib/strncpy.S | 2 +- arch/alpha/lib/strrchr.S | 2 +- arch/alpha/lib/udiv-qrnnd.S | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/arch/alpha/lib/callback_srm.S b/arch/alpha/lib/callback_srm.S index b13c4a231f1b..36b63f295170 100644 --- a/arch/alpha/lib/callback_srm.S +++ b/arch/alpha/lib/callback_srm.S @@ -3,8 +3,8 @@ * arch/alpha/lib/callback_srm.S */ +#include #include -#include .text #define HWRPB_CRB_OFFSET 0xc0 diff --git a/arch/alpha/lib/clear_page.S b/arch/alpha/lib/clear_page.S index ce02de7b0493..af70ee309a33 100644 --- a/arch/alpha/lib/clear_page.S +++ b/arch/alpha/lib/clear_page.S @@ -4,7 +4,7 @@ * * Zero an entire page. */ -#include +#include .text .align 4 .global clear_page diff --git a/arch/alpha/lib/clear_user.S b/arch/alpha/lib/clear_user.S index db6c6ca45896..848eb60a0010 100644 --- a/arch/alpha/lib/clear_user.S +++ b/arch/alpha/lib/clear_user.S @@ -10,7 +10,7 @@ * a successful copy). There is also some rather minor exception setup * stuff. */ -#include +#include /* Allow an exception for an insn; exit if we get one. */ #define EX(x,y...) \ diff --git a/arch/alpha/lib/copy_page.S b/arch/alpha/lib/copy_page.S index 5439a30c77d0..1c444fdad9a5 100644 --- a/arch/alpha/lib/copy_page.S +++ b/arch/alpha/lib/copy_page.S @@ -4,7 +4,7 @@ * * Copy an entire page. */ -#include +#include .text .align 4 .global copy_page diff --git a/arch/alpha/lib/copy_user.S b/arch/alpha/lib/copy_user.S index 32ab0344b185..ef18faafcad6 100644 --- a/arch/alpha/lib/copy_user.S +++ b/arch/alpha/lib/copy_user.S @@ -12,7 +12,7 @@ * exception setup stuff.. */ -#include +#include /* Allow an exception for an insn; exit if we get one. */ #define EXI(x,y...) \ diff --git a/arch/alpha/lib/csum_ipv6_magic.S b/arch/alpha/lib/csum_ipv6_magic.S index c7b213ab01ab..273c426c3859 100644 --- a/arch/alpha/lib/csum_ipv6_magic.S +++ b/arch/alpha/lib/csum_ipv6_magic.S @@ -13,7 +13,7 @@ * added by Ivan Kokshaysky */ -#include +#include .globl csum_ipv6_magic .align 4 .ent csum_ipv6_magic diff --git a/arch/alpha/lib/divide.S b/arch/alpha/lib/divide.S index 2b60eb45e50b..db01840d76ec 100644 --- a/arch/alpha/lib/divide.S +++ b/arch/alpha/lib/divide.S @@ -46,7 +46,7 @@ * $28 - compare status */ -#include +#include #define halt .long 0 /* diff --git a/arch/alpha/lib/ev6-clear_page.S b/arch/alpha/lib/ev6-clear_page.S index 325864c81586..a534d9ff7161 100644 --- a/arch/alpha/lib/ev6-clear_page.S +++ b/arch/alpha/lib/ev6-clear_page.S @@ -4,7 +4,7 @@ * * Zero an entire page. */ -#include +#include .text .align 4 .global clear_page diff --git a/arch/alpha/lib/ev6-clear_user.S b/arch/alpha/lib/ev6-clear_user.S index 7e644f83cdf2..af776cc45f91 100644 --- a/arch/alpha/lib/ev6-clear_user.S +++ b/arch/alpha/lib/ev6-clear_user.S @@ -29,7 +29,7 @@ * want to leave a hole (and we also want to avoid repeating lots of work) */ -#include +#include /* Allow an exception for an insn; exit if we get one. */ #define EX(x,y...) \ 99: x,##y; \ diff --git a/arch/alpha/lib/ev6-copy_page.S b/arch/alpha/lib/ev6-copy_page.S index fd7212c8dcf1..36be5113b7b7 100644 --- a/arch/alpha/lib/ev6-copy_page.S +++ b/arch/alpha/lib/ev6-copy_page.S @@ -57,7 +57,7 @@ destination pages are in the dcache, but it is my guess that this is less important than the dcache miss case. */ -#include +#include .text .align 4 .global copy_page diff --git a/arch/alpha/lib/ev6-copy_user.S b/arch/alpha/lib/ev6-copy_user.S index f3e433754397..b9b19710c364 100644 --- a/arch/alpha/lib/ev6-copy_user.S +++ b/arch/alpha/lib/ev6-copy_user.S @@ -23,7 +23,7 @@ * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 */ -#include +#include /* Allow an exception for an insn; exit if we get one. */ #define EXI(x,y...) \ 99: x,##y; \ diff --git a/arch/alpha/lib/ev6-csum_ipv6_magic.S b/arch/alpha/lib/ev6-csum_ipv6_magic.S index 9a73f90700a1..2ee548be98e3 100644 --- a/arch/alpha/lib/ev6-csum_ipv6_magic.S +++ b/arch/alpha/lib/ev6-csum_ipv6_magic.S @@ -53,7 +53,7 @@ * may cause additional delay in rare cases (load-load replay traps). */ -#include +#include .globl csum_ipv6_magic .align 4 .ent csum_ipv6_magic diff --git a/arch/alpha/lib/ev6-divide.S b/arch/alpha/lib/ev6-divide.S index 137ff1a07356..b73a6d26362e 100644 --- a/arch/alpha/lib/ev6-divide.S +++ b/arch/alpha/lib/ev6-divide.S @@ -56,7 +56,7 @@ * Try not to change the actual algorithm if possible for consistency. */ -#include +#include #define halt .long 0 /* diff --git a/arch/alpha/lib/ev6-memchr.S b/arch/alpha/lib/ev6-memchr.S index 56bf9e14eeee..f75ba43e61e3 100644 --- a/arch/alpha/lib/ev6-memchr.S +++ b/arch/alpha/lib/ev6-memchr.S @@ -28,7 +28,7 @@ * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 * Try not to change the actual algorithm if possible for consistency. */ -#include +#include .set noreorder .set noat diff --git a/arch/alpha/lib/ev6-memcpy.S b/arch/alpha/lib/ev6-memcpy.S index ffbd056b6eb2..3ef43c26c8af 100644 --- a/arch/alpha/lib/ev6-memcpy.S +++ b/arch/alpha/lib/ev6-memcpy.S @@ -20,7 +20,7 @@ * Temp usage notes: * $1,$2, - scratch */ -#include +#include .set noreorder .set noat diff --git a/arch/alpha/lib/ev6-memset.S b/arch/alpha/lib/ev6-memset.S index 1cfcfbbea6f0..89d7809da4cc 100644 --- a/arch/alpha/lib/ev6-memset.S +++ b/arch/alpha/lib/ev6-memset.S @@ -27,7 +27,7 @@ * as fixes will need to be made in multiple places. The performance gain * is worth it. */ -#include +#include .set noat .set noreorder .text diff --git a/arch/alpha/lib/ev67-strcat.S b/arch/alpha/lib/ev67-strcat.S index ec3096a9e8d4..f8c7305b11d6 100644 --- a/arch/alpha/lib/ev67-strcat.S +++ b/arch/alpha/lib/ev67-strcat.S @@ -20,7 +20,7 @@ * string once. */ -#include +#include .text .align 4 diff --git a/arch/alpha/lib/ev67-strchr.S b/arch/alpha/lib/ev67-strchr.S index fbf89e0b6dc3..97a7cb475309 100644 --- a/arch/alpha/lib/ev67-strchr.S +++ b/arch/alpha/lib/ev67-strchr.S @@ -16,7 +16,7 @@ * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 * Try not to change the actual algorithm if possible for consistency. */ -#include +#include #include .set noreorder diff --git a/arch/alpha/lib/ev67-strlen.S b/arch/alpha/lib/ev67-strlen.S index b73106ffbbc7..3d9078807ab4 100644 --- a/arch/alpha/lib/ev67-strlen.S +++ b/arch/alpha/lib/ev67-strlen.S @@ -18,7 +18,7 @@ * U - upper subcluster; U0 - subcluster U0; U1 - subcluster U1 * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 */ -#include +#include .set noreorder .set noat diff --git a/arch/alpha/lib/ev67-strncat.S b/arch/alpha/lib/ev67-strncat.S index ceb0ca528789..8f313233e3a7 100644 --- a/arch/alpha/lib/ev67-strncat.S +++ b/arch/alpha/lib/ev67-strncat.S @@ -21,7 +21,7 @@ * Try not to change the actual algorithm if possible for consistency. */ -#include +#include .text .align 4 diff --git a/arch/alpha/lib/ev67-strrchr.S b/arch/alpha/lib/ev67-strrchr.S index 7f80e398530f..ae7355f9ec56 100644 --- a/arch/alpha/lib/ev67-strrchr.S +++ b/arch/alpha/lib/ev67-strrchr.S @@ -19,7 +19,7 @@ * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 */ -#include +#include #include .set noreorder diff --git a/arch/alpha/lib/memchr.S b/arch/alpha/lib/memchr.S index c13d3eca2e05..45366e32feee 100644 --- a/arch/alpha/lib/memchr.S +++ b/arch/alpha/lib/memchr.S @@ -31,7 +31,7 @@ For correctness consider that: - only minimum number of quadwords may be accessed - the third argument is an unsigned long */ -#include +#include .set noreorder .set noat diff --git a/arch/alpha/lib/memmove.S b/arch/alpha/lib/memmove.S index 42d1922d0edf..3a27689e3390 100644 --- a/arch/alpha/lib/memmove.S +++ b/arch/alpha/lib/memmove.S @@ -7,7 +7,7 @@ * This is hand-massaged output from the original memcpy.c. We defer to * memcpy whenever possible; the backwards copy loops are not unrolled. */ -#include +#include .set noat .set noreorder .text diff --git a/arch/alpha/lib/memset.S b/arch/alpha/lib/memset.S index 00393e30df25..9075d6918346 100644 --- a/arch/alpha/lib/memset.S +++ b/arch/alpha/lib/memset.S @@ -14,7 +14,7 @@ * The scheduling comments are according to the EV5 documentation (and done by * hand, so they might well be incorrect, please do tell me about it..) */ -#include +#include .set noat .set noreorder .text diff --git a/arch/alpha/lib/strcat.S b/arch/alpha/lib/strcat.S index 055877dccd27..62b90ebbcf44 100644 --- a/arch/alpha/lib/strcat.S +++ b/arch/alpha/lib/strcat.S @@ -5,7 +5,7 @@ * * Append a null-terminated string from SRC to DST. */ -#include +#include .text diff --git a/arch/alpha/lib/strchr.S b/arch/alpha/lib/strchr.S index 17871dd00280..68c54ff50dfe 100644 --- a/arch/alpha/lib/strchr.S +++ b/arch/alpha/lib/strchr.S @@ -6,7 +6,7 @@ * Return the address of a given character within a null-terminated * string, or null if it is not found. */ -#include +#include #include .set noreorder diff --git a/arch/alpha/lib/strcpy.S b/arch/alpha/lib/strcpy.S index cb74ad23a90d..d8773ba77525 100644 --- a/arch/alpha/lib/strcpy.S +++ b/arch/alpha/lib/strcpy.S @@ -6,7 +6,7 @@ * Copy a null-terminated string from SRC to DST. Return a pointer * to the null-terminator in the source. */ -#include +#include .text .align 3 diff --git a/arch/alpha/lib/strlen.S b/arch/alpha/lib/strlen.S index dd882fe4d7e3..4fc6a6ff24cd 100644 --- a/arch/alpha/lib/strlen.S +++ b/arch/alpha/lib/strlen.S @@ -12,7 +12,7 @@ * do this instead of the 9 instructions that * binary search needs). */ -#include +#include .set noreorder .set noat diff --git a/arch/alpha/lib/strncat.S b/arch/alpha/lib/strncat.S index 522fee3e26ac..a913a7c84a39 100644 --- a/arch/alpha/lib/strncat.S +++ b/arch/alpha/lib/strncat.S @@ -10,7 +10,7 @@ * past count, whereas libc may write to count+1. This follows the generic * implementation in lib/string.c and is, IMHO, more sensible. */ -#include +#include .text .align 3 diff --git a/arch/alpha/lib/strncpy.S b/arch/alpha/lib/strncpy.S index cc57fad8b7ca..cb90cf022df3 100644 --- a/arch/alpha/lib/strncpy.S +++ b/arch/alpha/lib/strncpy.S @@ -11,7 +11,7 @@ * version has cropped that bit o' nastiness as well as assuming that * __stxncpy is in range of a branch. */ -#include +#include .set noat .set noreorder diff --git a/arch/alpha/lib/strrchr.S b/arch/alpha/lib/strrchr.S index 7650ba99b7e2..dd8e073b6cf2 100644 --- a/arch/alpha/lib/strrchr.S +++ b/arch/alpha/lib/strrchr.S @@ -6,7 +6,7 @@ * Return the address of the last occurrence of a given character * within a null-terminated string, or null if it is not found. */ -#include +#include #include .set noreorder diff --git a/arch/alpha/lib/udiv-qrnnd.S b/arch/alpha/lib/udiv-qrnnd.S index b887aa5428e5..96f05918bffe 100644 --- a/arch/alpha/lib/udiv-qrnnd.S +++ b/arch/alpha/lib/udiv-qrnnd.S @@ -25,7 +25,7 @@ # along with GCC; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -#include +#include .set noreorder .set noat From patchwork Sat Aug 19 23:33:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136282 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2569313vqi; Sun, 20 Aug 2023 10:07:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnGgbyprKH515DSjvTuu8Mfhc/AKznyugU8jnZplIavyk7zZXO8xdyW2B7gLzkuCpiDabu X-Received: by 2002:a05:6a20:1447:b0:148:40cf:b832 with SMTP id a7-20020a056a20144700b0014840cfb832mr3265336pzi.18.1692551224024; Sun, 20 Aug 2023 10:07:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692551224; cv=none; d=google.com; s=arc-20160816; b=EsSjVVViHI/wKE6WrpATjxW8PH1JqEFaTSMUrnLnq3PHbGJg7D1rAG82b48iipl/90 zZ62nN6R3A6gIdzqHdUAnjiNQ7/L+4LTWPm1whufuENuxB4eFUuy+fwIsldtgIseIdAD U278NIPT3NntnrkWu4kmDtFsiRwgsNRzg8eIzLTnxgWIgSXV7sKBD2o0nTBUN0FAjRLZ 3noqeZHlpn/a0zzUZRSVZ+MeC0/PUwNwesuhLg9l6JF4ql3gpzhmYQLaMCPtnGxwRWjN k9Vg63n8gfqVF72qBn9NyT/gFexnfvHoS9THriqxghuZ86CP2dW7MWjX4ZnQ20O33UIR x19g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ljPQBYSPBDTqsafeYlsf9W1OGfmb5xUVK1hySXjrUpo=; fh=x/a+U7MCyNIry9LPNTn5W2RFJtXjzHox1RyHxhDhSk4=; b=ufCn69cikJgCNl5o9OTXK6O8rr3eQD9MPPC9P82A+o+6L9yKEaD6VcZlezmUFaT/MX ASnY4EXbyM84gquSsfnCxIA/OBx4xYBZ0/FBFZk5W87npqX21tS7obC6dVqRflSAQZwg biniNA9PaACdz6RQLDVmQghN0CNFeR317Z8ZWEM42TxkWOCUUD7zlLnkM9dAxOqjvgNQ Uc7SWxZIQ29V6yXwBEXWOKptQxKuc/2aKy32legnTDBquNi/KM6sDM6Z8c3JrY4axn4N J5TdWRXKaZjxoSQkO7mKYnH1bj2A8M0bT86JR7fky6rEYAQTz9JlXLGUTBJzryyAAuvK BZ4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="JsMv3/rg"; 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 q3-20020a170902e30300b001bdd35033f4si5163156plc.387.2023.08.20.10.06.50; Sun, 20 Aug 2023 10:07:04 -0700 (PDT) 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="JsMv3/rg"; 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 S229845AbjHTCdu (ORCPT + 99 others); Sat, 19 Aug 2023 22:33:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229838AbjHTCdk (ORCPT ); Sat, 19 Aug 2023 22:33:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1939D88CFB; Sat, 19 Aug 2023 16:34:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A056061A77; Sat, 19 Aug 2023 23:34:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8378FC433C8; Sat, 19 Aug 2023 23:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692488047; bh=94swkMMWtMWXwlQ0MRgkdCnBJXEwx0etvzk4fEwCRDY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JsMv3/rggBxUAEy32zChNAPBOEk124vJgtFdFlqmhzojWGUfnGlmH6Dv0D7biSBGU MfhY7jR5WQoXC7RaHkedup9FAPC3Yp/FcJYsRDRtWZhGUxs6VKkJA0GulpwgYdTqt1 glqQGzkihFlP0v7PsYiLUsEts+9sl2NbYYXwox5Gkjfd3G5Yig9l6GhGhUegCmEEIM lULmSruHs4a9z5EMqm8m6WOK94P5TolXC9oIFJewviheEF6XiezAxgZtoNjWlVB8nh NjOk2dED6IoyJT748l7aOqXD7gaTRXbi95OD0Lzq5QdJERcYSkX3l4JMndODHH/SBt hs5iKuiYFfJPw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org, Masahiro Yamada , Ivan Kokshaysky , Matt Turner , Richard Henderson , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] alpha: remove Date: Sun, 20 Aug 2023 08:33:53 +0900 Message-Id: <20230819233353.3683813-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230819233353.3683813-1-masahiroy@kernel.org> References: <20230819233353.3683813-1-masahiroy@kernel.org> 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: INBOX X-GMAIL-THRID: 1774768592584498839 X-GMAIL-MSGID: 1774768592584498839 All *.S files under arch/alpha/ have been converted to include instead of . Remove . Signed-off-by: Masahiro Yamada --- arch/alpha/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index dd31e97edae8..396caece6d6d 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/include/asm/Kbuild @@ -3,6 +3,5 @@ generated-y += syscall_table.h generic-y += agp.h generic-y += asm-offsets.h -generic-y += export.h generic-y += kvm_para.h generic-y += mcs_spinlock.h