From patchwork Mon Aug 7 15:32:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13344430 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB52DC001B0 for ; Mon, 7 Aug 2023 15:32:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230346AbjHGPc4 (ORCPT ); Mon, 7 Aug 2023 11:32:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230269AbjHGPcv (ORCPT ); Mon, 7 Aug 2023 11:32:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 493A9BD; Mon, 7 Aug 2023 08:32:50 -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 DB88661E0C; Mon, 7 Aug 2023 15:32:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34E9EC433C8; Mon, 7 Aug 2023 15:32:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691422369; bh=/uziKBOz0Ulect0QjG+rpsPYlSVkOGh4loFdVsG0S1c=; h=From:To:Cc:Subject:Date:From; b=ljupM/8nM4zcDEW6o4Y8mGJFsQGXGTsHjGAQkke9TqY7XilPqnjaDwLzYYMG8OKnE pt2Cc5Js/SNNRpYpJnBfcKsWSu0Cvsrkv5Tv/YtfhLuADt06nTCuZwm7qL5LIB0qQL +wjD1y5UhsV6+Tk0z91ASmWGj2++Vrvvgq6cVs4M2Z3CHQdPH8r9/lTmiuSazBU8sJ 1NcLNh1E/PcCMAR1ANazYZTsOCtbZ9dy8dZeF+qhwnwqCuczeRQObuGPUdPzGrGq0l IRuZrdpeq2mWR8M6wVc7T9tFDMUmzQmlle1K41YWCWKiF6ASsJiyBoy8wrHud3AXqZ hduveCSkZVe+g== From: Masahiro Yamada To: Thomas Bogendoerfer , linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Masahiro Yamada Subject: [PATCH 1/3] mips: remove unneeded #include Date: Tue, 8 Aug 2023 00:32:41 +0900 Message-Id: <20230807153243.996262-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org There is no EXPORT_SYMBOL line there, hence #include is unneeded. Signed-off-by: Masahiro Yamada Reviewed-by: Philippe Mathieu-Daudé --- arch/mips/kernel/octeon_switch.S | 1 - arch/mips/kernel/r2300_switch.S | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S index 9b7c8ab6f08c..447a3ea14aa1 100644 --- a/arch/mips/kernel/octeon_switch.S +++ b/arch/mips/kernel/octeon_switch.S @@ -11,7 +11,6 @@ * written by Carsten Langgaard, carstenl@mips.com */ #include -#include #include #include #include diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S index 71b1aafae1bb..48e63943e6f7 100644 --- a/arch/mips/kernel/r2300_switch.S +++ b/arch/mips/kernel/r2300_switch.S @@ -13,7 +13,6 @@ */ #include #include -#include #include #include #include From patchwork Mon Aug 7 15:32:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13344432 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41025C04A94 for ; Mon, 7 Aug 2023 15:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229704AbjHGPc4 (ORCPT ); Mon, 7 Aug 2023 11:32:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230309AbjHGPcx (ORCPT ); Mon, 7 Aug 2023 11:32:53 -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 1267FBD; Mon, 7 Aug 2023 08:32:52 -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 744D861E0C; Mon, 7 Aug 2023 15:32:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACF98C433C9; Mon, 7 Aug 2023 15:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691422370; bh=WDVv22MYYfLqjdwf8Gw7PbfPu+30r8uVpIIUVl3UkFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cWfaVxKnRv69ooHYPILI0MVK98tkMGMuwWYY76pcQWuyB3YkoQXAAbcnObAI68n1T /8zec6weUmLF+gdxCYWPQRhfjzA4aXSnn5iYnn/UAyd3Wwq5AurhQjtrLU5EI8qXGu sUk+9jS+zxAGvvk0V9OgRNWHlq4s72VQzjBly9Y6oIZXGdpTakiTgkqWmkedGV+my0 5N18gSVC76THBVKWtpw1lxjlv5cP6e+srqK+P5QBnFWfp75FIIaDPk6+bNwpa7mEMZ sxBpoG+mC1MKrnTuA5yKBmuVDW++FKnYxesqUiaNYPrPLgbwspjG4gJhSQ3sISs+Nf XVofTJLalCj5w== From: Masahiro Yamada To: Thomas Bogendoerfer , linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Masahiro Yamada Subject: [PATCH 2/3] mips: replace #include with #include Date: Tue, 8 Aug 2023 00:32:42 +0900 Message-Id: <20230807153243.996262-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230807153243.996262-1-masahiroy@kernel.org> References: <20230807153243.996262-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org 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 Reviewed-by: Philippe Mathieu-Daudé --- arch/mips/cavium-octeon/octeon-memcpy.S | 2 +- arch/mips/kernel/mcount.S | 2 +- arch/mips/kernel/r2300_fpu.S | 2 +- arch/mips/kernel/r4k_fpu.S | 2 +- arch/mips/lib/csum_partial.S | 2 +- arch/mips/lib/memcpy.S | 2 +- arch/mips/lib/memset.S | 2 +- arch/mips/lib/strncpy_user.S | 2 +- arch/mips/lib/strnlen_user.S | 2 +- arch/mips/mm/page-funcs.S | 2 +- arch/mips/mm/tlb-funcs.S | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/mips/cavium-octeon/octeon-memcpy.S b/arch/mips/cavium-octeon/octeon-memcpy.S index 25860fba6218..fef0c6de3fa1 100644 --- a/arch/mips/cavium-octeon/octeon-memcpy.S +++ b/arch/mips/cavium-octeon/octeon-memcpy.S @@ -13,9 +13,9 @@ * Mnemonic names for arguments to memcpy/__copy_user */ +#include #include #include -#include #include #define dst a0 diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S index cff52b283e03..fcec579f64e9 100644 --- a/arch/mips/kernel/mcount.S +++ b/arch/mips/kernel/mcount.S @@ -10,7 +10,7 @@ * Author: Wu Zhangjin */ -#include +#include #include #include #include diff --git a/arch/mips/kernel/r2300_fpu.S b/arch/mips/kernel/r2300_fpu.S index 6c745aa9e825..c000b22e3fcd 100644 --- a/arch/mips/kernel/r2300_fpu.S +++ b/arch/mips/kernel/r2300_fpu.S @@ -11,10 +11,10 @@ * Further modifications to make this work: * Copyright (c) 1998 Harald Koerfgen */ +#include #include #include #include -#include #include #include #include diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S index 4e8c98517d9d..4bb97ee89904 100644 --- a/arch/mips/kernel/r4k_fpu.S +++ b/arch/mips/kernel/r4k_fpu.S @@ -12,10 +12,10 @@ * Copyright (C) 2000 MIPS Technologies, Inc. * Copyright (C) 1999, 2001 Silicon Graphics, Inc. */ +#include #include #include #include -#include #include #include #include diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S index 7767137c3e49..3d2ff4118d79 100644 --- a/arch/mips/lib/csum_partial.S +++ b/arch/mips/lib/csum_partial.S @@ -11,9 +11,9 @@ * Copyright (C) 2014 Imagination Technologies Ltd. */ #include +#include #include #include -#include #include #ifdef CONFIG_64BIT diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S index 18a43f2e29c8..a4b4e805ff13 100644 --- a/arch/mips/lib/memcpy.S +++ b/arch/mips/lib/memcpy.S @@ -32,9 +32,9 @@ #undef CONFIG_CPU_HAS_PREFETCH #endif +#include #include #include -#include #include #define dst a0 diff --git a/arch/mips/lib/memset.S b/arch/mips/lib/memset.S index 0b342bae9a98..79405c32cc85 100644 --- a/arch/mips/lib/memset.S +++ b/arch/mips/lib/memset.S @@ -8,9 +8,9 @@ * Copyright (C) 2007 by Maciej W. Rozycki * Copyright (C) 2011, 2012 MIPS Technologies, Inc. */ +#include #include #include -#include #include #if LONGSIZE == 4 diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S index 13aaa9927ad1..94f4203563c1 100644 --- a/arch/mips/lib/strncpy_user.S +++ b/arch/mips/lib/strncpy_user.S @@ -7,9 +7,9 @@ * Copyright (C) 2011 MIPS Technologies, Inc. */ #include +#include #include #include -#include #include #define EX(insn,reg,addr,handler) \ diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S index 6de31b616f9c..c192a6f6cd84 100644 --- a/arch/mips/lib/strnlen_user.S +++ b/arch/mips/lib/strnlen_user.S @@ -6,9 +6,9 @@ * Copyright (c) 1996, 1998, 1999, 2004 by Ralf Baechle * Copyright (c) 1999 Silicon Graphics, Inc. */ +#include #include #include -#include #include #define EX(insn,reg,addr,handler) \ diff --git a/arch/mips/mm/page-funcs.S b/arch/mips/mm/page-funcs.S index 43181ac0a1af..42d0516ca18a 100644 --- a/arch/mips/mm/page-funcs.S +++ b/arch/mips/mm/page-funcs.S @@ -8,8 +8,8 @@ * Copyright (C) 2012 MIPS Technologies, Inc. * Copyright (C) 2012 Ralf Baechle */ +#include #include -#include #include #ifdef CONFIG_SIBYTE_DMA_PAGEOPS diff --git a/arch/mips/mm/tlb-funcs.S b/arch/mips/mm/tlb-funcs.S index 00fef578c8cd..2705d7dcb33e 100644 --- a/arch/mips/mm/tlb-funcs.S +++ b/arch/mips/mm/tlb-funcs.S @@ -11,8 +11,8 @@ * Copyright (C) 2012 MIPS Technologies, Inc. * Copyright (C) 2012 Ralf Baechle */ +#include #include -#include #include #define FASTPATH_SIZE 128 From patchwork Mon Aug 7 15:32:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13344431 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C0B3C41513 for ; Mon, 7 Aug 2023 15:32:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229554AbjHGPc5 (ORCPT ); Mon, 7 Aug 2023 11:32:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230336AbjHGPcy (ORCPT ); Mon, 7 Aug 2023 11:32:54 -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 1A86899; Mon, 7 Aug 2023 08:32:54 -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 993D461D9A; Mon, 7 Aug 2023 15:32:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D557BC433C7; Mon, 7 Aug 2023 15:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691422373; bh=vOf1XqgmYLSwrx6KzBjR0fMHLia73ppzcL8DVn7baw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BPjrcJ5CcPuV83asiURhBN0ARRksVqvPAdrxHCXdlNGpSG1wyTQusM9cnn1gLaFKS swlzncvfKpAIC5ftFmJIppPA3Eh30LUBZBx97usk8zftSJ6mTp+9Xc93dVASQxC2kF x0cZstAa57lJjhY0459IIdl3OLAWXJyP/6xVSMd9DikIu49J4BmaLWpMnOIPesvK9V v+WJngSxZ0r4cAyzV43ezWJF1kSOa8ke444XJlDYsgkr51QqbqCa/tpufnLCWXj9NU 9YtzhusR9z9r7jt24q85EhSKYCoVBsoeymGnTso9tXVeLXjFljzFC53jsMqxY0u8Et NQTxmLnrLTYdA== From: Masahiro Yamada To: Thomas Bogendoerfer , linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Masahiro Yamada Subject: [PATCH 3/3] mips: remove Date: Tue, 8 Aug 2023 00:32:43 +0900 Message-Id: <20230807153243.996262-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230807153243.996262-1-masahiroy@kernel.org> References: <20230807153243.996262-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org All *.S files under arch/mips/ have been converted to include instead of . Remove . Signed-off-by: Masahiro Yamada Reviewed-by: Philippe Mathieu-Daudé --- arch/mips/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild index dee172716581..7ba67a0d6c97 100644 --- a/arch/mips/include/asm/Kbuild +++ b/arch/mips/include/asm/Kbuild @@ -7,7 +7,6 @@ generated-y += unistd_nr_n32.h generated-y += unistd_nr_n64.h generated-y += unistd_nr_o32.h -generic-y += export.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += parport.h