From patchwork Tue Jul 23 06:41:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13739433 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2FCFC3DA63 for ; Tue, 23 Jul 2024 06:43:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4834D6B007B; Tue, 23 Jul 2024 02:43:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4330C6B009B; Tue, 23 Jul 2024 02:43:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D4D46B009C; Tue, 23 Jul 2024 02:43:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 10CD36B007B for ; Tue, 23 Jul 2024 02:43:33 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B272A121C69 for ; Tue, 23 Jul 2024 06:43:32 +0000 (UTC) X-FDA: 82370076264.09.5AE7239 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf14.hostedemail.com (Postfix) with ESMTP id 71903100003 for ; Tue, 23 Jul 2024 06:43:30 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ODt+aK2h; spf=pass (imf14.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721716964; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZhJi20MUOJfePJcE3KmljE/8WO+yAkTjb2C+l4o3Q9U=; b=CUDQuUDUDDlYZ/dNDczZwpUdWLe3m65NvdWbi7/edoL681XCc7eYD2uJlIv/5Btxbp6zsh jMzFlBLG0pB0B8vDHreqafAZest0iCAqUXICYt5vM66zjDea8rBQOAH862xIRxC9rAyT4q tezsIowJckuGshj7bfvbU7/HeMlp4Uo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721716964; a=rsa-sha256; cv=none; b=KPJlE0ij2eY9dVQzTgnuikY9G3ndD4uMK+C/OEc9J5QVr/lM+Q3pm8EhOvMioy2HDFIE9l Xc6bW1FJtdOUyxfS5dZta2hsKzvM//CRu86qi5BKLMz4ZyLi/mySMnmOmAf5H6IFUO2Y60 SAkIAbsoI3pZtomzSqaT1L1Lq4pYleU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ODt+aK2h; spf=pass (imf14.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 8E6AACE0CF9; Tue, 23 Jul 2024 06:43:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7754C4AF09; Tue, 23 Jul 2024 06:43:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721717006; bh=V+dgSsdkLeaynaNLrjIFS/zeTuKNf5COhGBjma8zEGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ODt+aK2hntJ4K/DgO09RgcVQDVlgQib7Wv18s95VxuIsyiapHrjR7UpxaSrWvMh/B pj3Df2JE3Wp1haN0UUedtmKxV3QLcnwsj0QgyWl9r7C+gnNnLt38Yzqwv1j7beSwg5 aH2rb9R5eYKrpG2YqG8XS3aPxzV8glDHV5NMOCllzocifqXGs4uVkaHjHX768pSxWO Z25iFtRytazM4PcLalHwExjd1r6Tv/naAwgXnuZ5/yXhkY5HpR+cvHkuCkRX2imv3e +ecyEpCYd8FvvUZv/y821Qk4J0ZBS9qM1kFYRI+35C+c6GuPpt12bRmNQgnF1uSmwF vpeO54BCZmIOg== From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Andreas Larsson , Andrew Morton , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christophe Leroy , Dan Williams , Dave Hansen , David Hildenbrand , "David S. Miller" , Davidlohr Bueso , Greg Kroah-Hartman , Heiko Carstens , Huacai Chen , Ingo Molnar , Jiaxun Yang , John Paul Adrian Glaubitz , Jonathan Cameron , Jonathan Corbet , Michael Ellerman , Mike Rapoport , Palmer Dabbelt , "Rafael J. Wysocki" , Rob Herring , Samuel Holland , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Will Deacon , Zi Yan , devicetree@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-cxl@vger.kernel.org, linux-doc@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, nvdimm@lists.linux.dev, sparclinux@vger.kernel.org, x86@kernel.org Subject: [PATCH v2 06/25] MIPS: loongson64: drop HAVE_ARCH_NODEDATA_EXTENSION Date: Tue, 23 Jul 2024 09:41:37 +0300 Message-ID: <20240723064156.4009477-7-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240723064156.4009477-1-rppt@kernel.org> References: <20240723064156.4009477-1-rppt@kernel.org> MIME-Version: 1.0 X-Stat-Signature: 5wtt9bnz61u81ut9n8rik9pu67tgztwf X-Rspamd-Queue-Id: 71903100003 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1721717010-558376 X-HE-Meta: U2FsdGVkX1+L2+9CorW83f7WVvKEHeIBsE48iSnbosbvIuUQQSJlNj0vSVkKp0/8+6CZaMtqRq4g9n4vIpPPy7gAc3kxvle0TLQ4TFG4cr3OjkH0YY+Ee7S+0/ahWLRGEQi4LU44AcZhNmYUwaCgCxLbE57XGnazarTgjtxsP2E/9ZYbrD7wezz9WozrpLjoW/cyt6xkDfvrs+XIGO4tQSyV9ZzqxHUVGUpd2kM2ICjROlBK4TSFXlnbsrKgGgaXNbHeAIXRV44F4XCMEzsZ1I5jzKGEVzWdmkoeuGKCUVgkMZ6WzI3AZX9NLRkvvD1Xjsc0BdQEx8ZZRFCzbSFg18bzWs3dibRfD3v6d6c1Q92bjBTmvCGJ5fEUYluuXC6AvUHhNEvpXYbSkVFu6i3hKe61BZU74rz/lt9C2SMEZeOJbjcIchFe6i2MZ8ZSixSUrRHB0ClJZ21SU5R4Qq1qc5rA87dLsJnc13w/B4JzmfZuzjKvFEwNAnnUpqpqKENT3hfQpHyQkchQFTcvYStKaVkeztfE1f19MtfSapjo+EjgUaLg0tF+FMVBgRGfPqDkEyI+6UIJMKcr2LJmyvP5X+g3cGpdmhs3rLRLF2g33Gl+sBdVHUDWbE4eJTMgFKyBcu7xxw7eknC+vYXzOr4fZiiH7edG98bS0wwReELFGnYokbUBIPi2ch/vVYbGjoFnncCqb4IF+XPLIKtf713wt2v/ZL09W93RUUkf80en2aXQIvDKryQpIi3iePxB6hOrJOJh1d6/saKry3Z0VaPnl7DLECdnbkeaywWKqgV4BdgjpViCXtcwGofDYgCQxGt2+YMJMvrLY1hqLVVJqYbjKTlO5TR9eaJOkvaWzr0H26eDyOu/cURsSh3bxUuKmADAQJhF7+prThAJwSr4QW8gzsWEKNBsL8pOkM62Bc06cCppW6b/ipY6VayURAEC0lR99XVL4UbRtuIdbYkSRp/ ETUzTAju TAc6IlknKJIaEJmgc2Gne9ryeZyhHW2tznPRsnmgmdUW/dcz6v3QYh5TDz4fDITo9unwdOPuCDg35L09N+fHHTOUp6elEW7rj9L1Xop6/o73wwUvK/AwnnzoWgeegSm+mqCx+j4ZPH5AnVX6sRHIuppBHeexbLYGBZqi/HKuyZ7K45OUOXnQNTjQc1oLL3CyF4sol1128RVDTuWXXNtlTXAVrhSVtdUhSC93oO71Cdfleg+MI9kNtsDywqRwXFoqMG5Hufus2958m4z3E4IYElepU3TLngo+3EFu2FAd8ElbeIK8yfLMuBKQtzXz+F9xKgLsM X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" Commit f8f9f21c7848 ("MIPS: Fix build error for loongson64 and sgi-ip27") added HAVE_ARCH_NODEDATA_EXTENSION to loongson64 to silence a compilation error that happened because loongson64 didn't define array of pg_data_t as node_data like most other architectures did. After rename of __node_data to node_data arch_alloc_nodedata() and HAVE_ARCH_NODEDATA_EXTENSION can be dropped from loongson64. Since it was the only user of HAVE_ARCH_NODEDATA_EXTENSION config option also remove this option from arch/mips/Kconfig. Signed-off-by: Mike Rapoport (Microsoft) --- arch/mips/Kconfig | 4 ---- arch/mips/loongson64/numa.c | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 954f12a9e669..8221e47457aa 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -501,7 +501,6 @@ config MACH_LOONGSON64 select USE_OF select BUILTIN_DTB select PCI_HOST_GENERIC - select HAVE_ARCH_NODEDATA_EXTENSION if NUMA help This enables the support of Loongson-2/3 family of machines. @@ -2608,9 +2607,6 @@ config NUMA config SYS_SUPPORTS_NUMA bool -config HAVE_ARCH_NODEDATA_EXTENSION - bool - config RELOCATABLE bool "Relocatable kernel" depends on SYS_SUPPORTS_RELOCATABLE diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c index b50ce28d2741..64fcfaa885b6 100644 --- a/arch/mips/loongson64/numa.c +++ b/arch/mips/loongson64/numa.c @@ -198,13 +198,3 @@ void __init prom_init_numa_memory(void) pr_info("CP0_PageGrain: CP0 5.1 (0x%x)\n", read_c0_pagegrain()); prom_meminit(); } - -pg_data_t * __init arch_alloc_nodedata(int nid) -{ - return memblock_alloc(sizeof(pg_data_t), SMP_CACHE_BYTES); -} - -void arch_refresh_nodedata(int nid, pg_data_t *pgdat) -{ - node_data[nid] = pgdat; -}