From mboxrd@z Thu Jan 1 00:00:00 1970 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 D6025C28B2E for ; Thu, 13 Mar 2025 13:51:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02D4F28000A; Thu, 13 Mar 2025 09:51:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F208C280008; Thu, 13 Mar 2025 09:51:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE76328000A; Thu, 13 Mar 2025 09:51:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BFC05280008 for ; Thu, 13 Mar 2025 09:51:18 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D6DC81A216D for ; Thu, 13 Mar 2025 13:51:20 +0000 (UTC) X-FDA: 83216664720.27.C6D80D4 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf20.hostedemail.com (Postfix) with ESMTP id AE2C51C000D for ; Thu, 13 Mar 2025 13:51:18 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DUZeqivF; spf=pass (imf20.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741873879; 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=f/Tjv7nZ1RGU38sSJe49qG5HH8eeGxe0gmVd2kGHllo=; b=6hNIaxFVZx0mEuKa5DULn1/rkaEdWf+RLUQviErgxrVH8Z/TH+P0XLOpxCzx+c2Y6JL64L PWR+Ye29n/7lgqXzKFHkBy4ZANkSPkEywhx+K6arLe176clxBjMliDmwRZKsUZUBXq6Odi F1tdyNqB1MnkX9Ct0LNQ1qTD5IEEVns= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741873879; a=rsa-sha256; cv=none; b=ZNOuClNcX5Fxv/tYnOBxe7irH8IltvVXB09WzdqMVHKWa3cPd6q+4EbncvTsJblGEaECWm YMvdVXi4+Y0eAmfgZPe40Dqhf+eCkqQ6YTPTnfgObaSQnx++ybrIg9zK/lEb33WWTcKzCd PwF6bEsjTS/ij6im91N3hrL3es1VUUA= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DUZeqivF; spf=pass (imf20.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id ECF71A474BF; Thu, 13 Mar 2025 13:45:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BA2EC4CEF2; Thu, 13 Mar 2025 13:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873876; bh=nkBe6+9DINra8ChNyXeYcesTu6mPwjeTN1yq3Y1szbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DUZeqivFJ9EYP9Zy5Yb5dJalUE7Sb9X9atTVUnHZ/8j5kxTnIcryI91Lg+eLahCch +4/sfT0f6PJUfGIy2IFanNG6A/SLgSjazaFTA527QDMKz4pRayRywROhwmKdm3JxlH Uaj0ch2Iv70h6kezQtFA/9UBiPtXqykcVjOMdYtmACBIyWki5ZD6vyT7Dwybtv0ic7 n9LWmVF+6qTkSWN3/DV0+azu4ZrNZg6SffekFyWnjGKFnrFNUttXXpQq00r7GYSixQ 2oLgogEMVsNX2bHppECFrGmjyvZM4fH0hNySDtDwvQnL1mRuqs8UADBKrepv0pyUKk bQ1hkzIwD6VDQ== From: Mike Rapoport To: Andrew Morton Cc: Alexander Gordeev , Andreas Larsson , Andy Lutomirski , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Dave Hansen , "David S. Miller" , Dinh Nguyen , Geert Uytterhoeven , Gerald Schaefer , Guo Ren , Heiko Carstens , Helge Deller , Huacai Chen , Ingo Molnar , Jiaxun Yang , Johannes Berg , John Paul Adrian Glaubitz , Madhavan Srinivasan , Mark Brown , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Stafford Horne , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Vineet Gupta , Will Deacon , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: [PATCH v2 04/13] MIPS: consolidate mem_init() for NUMA machines Date: Thu, 13 Mar 2025 15:49:54 +0200 Message-ID: <20250313135003.836600-5-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250313135003.836600-1-rppt@kernel.org> References: <20250313135003.836600-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: AE2C51C000D X-Stat-Signature: si4pezy38rdqr698u46ayorgf5rwqcxf X-HE-Tag: 1741873878-821264 X-HE-Meta: U2FsdGVkX19JDQLdzk/eehrSqZcR2Qtm2poHc2wofVJ2mP1jQ+h4xBWDTA+dK6L3VwRQKyadPWLe/0448jsZ+n7fPOBQksqZPHgn+eNlvXQ5DSfsc/Ny/kB9+fJexbGAZvfReVHN91M064AgTpmUh7ZubWKt/IsM0PpbvMj+Qr+dzxn1UJWp1Q32MfdNlkjGskS9trqCrBfRoOy1wVIRde2ZV6jk+cKO2iC2i0qfeJwEF4UhKbrQIyAns3wYPQqF04a5xWKysMmStcRmTLxpmKTUd6RfKHnzAIW2IdKZsEmWNktsQ1WWB1YxECqk5d4zkRc/NAB3QjYHSTKSjY1oF4NTendH+gZ+OgwHjoDQi1el4dJup0M+1AujYPgITKHBAlqBpDRYbtCFBqDgu2c6Ik5wJ1Fn8c7rKSnYk2ZbqRWseurMAXIIGoZ0SXIuWmisFYIX0DbvL5hHS0KLg+v+3/NrY0RpYSh/2XOedmFCphphD5nwjFiyPmCrxUuSvFh705nW8Hy6tzhhWJjgXl3jQcZKkv+JhdCVlyl5ZsMrqp1hQ4cuMxy7JMNfeIQ2dm4COAYjMRZyxmjmL6RUnznRK+VSINQvr+t5aTFCgTt4opLEW073TO78gshc/3qziq0v89R2R3Rc1wWJzaeDjaifrfaJz2m3T8jlbCG/9HFClVENwInwlJLIVsDpOVhyfMzJD5lUQAg+IcWiZMPYJP8492N+UVWkFi/NMygWoDl9VaOgib1iuLMhTP6tFrLedXcLcLYiuutf+/pRHYCPFGDL9gF3Msa/GIyU085C+6vluFD0VUXQ4fJc4VhgVAO8mG1+2ezBP5vTFjhqvIUjg4Vd1JwrDJ6s8GPYctFxl6RTRVRa+7iPOcMgliBzslPIzG1wkz3hyXAmHHdwKi8ja7vDL8gKSSr+X5rNbi2Jdf0xqG60e9hF0aZh/3VAPnyO036Fcui4fnRa4KrBmkBKMZC RYXZpoxS 5wrbFl8pAEN5lj+GjBiXw/58Q6KT5tvye1ID8cFUFKYzhlHuBYwKpIMlPe10jW8Y+i9y+Ld1AoFtrF0lfaIBmgoFOe0/BJUnODZotCNec/GPExfHzW8qlDk/k2iCoCNzrSq3osiQW6GGWSMICse5XiseTKr0CtEPJAYMWSOlPqX3UZhCHZ12tRLPRI1e5npXSOxHa2B+R03zkKTyERE4Jtc0WDTR9mymjfC3sl+ZPrFQBELKmMe8UbioYRqiaOPC9S/whHKv1KXOzlkyulfA+w4yA2A== 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)" Both MIPS systems that support numa (loongsoon3 and sgi-ip27) have identical mem_init() for NUMA case. Move that into arch/mips/mm/init.c and drop duplicate per-machine definitions. Signed-off-by: Mike Rapoport (Microsoft) --- arch/mips/loongson64/numa.c | 7 ------- arch/mips/mm/init.c | 7 +++++++ arch/mips/sgi-ip27/ip27-memory.c | 9 --------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c index 8388400d052f..95d5f553ce19 100644 --- a/arch/mips/loongson64/numa.c +++ b/arch/mips/loongson64/numa.c @@ -164,13 +164,6 @@ void __init paging_init(void) free_area_init(zones_size); } -void __init mem_init(void) -{ - high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); - memblock_free_all(); - setup_zero_pages(); /* This comes from node 0 */ -} - /* All PCI device belongs to logical Node-0 */ int pcibus_to_node(struct pci_bus *bus) { diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 4583d1a2a73e..3db6082c611e 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -482,6 +482,13 @@ void __init mem_init(void) 0x80000000 - 4, KCORE_TEXT); #endif } +#else /* CONFIG_NUMA */ +void __init mem_init(void) +{ + high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); + memblock_free_all(); + setup_zero_pages(); /* This comes from node 0 */ +} #endif /* !CONFIG_NUMA */ void free_init_pages(const char *what, unsigned long begin, unsigned long end) diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index 1963313f55d8..2b3e46e2e607 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c @@ -406,8 +406,6 @@ void __init prom_meminit(void) } } -extern void setup_zero_pages(void); - void __init paging_init(void) { unsigned long zones_size[MAX_NR_ZONES] = {0, }; @@ -416,10 +414,3 @@ void __init paging_init(void) zones_size[ZONE_NORMAL] = max_low_pfn; free_area_init(zones_size); } - -void __init mem_init(void) -{ - high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); - memblock_free_all(); - setup_zero_pages(); /* This comes from node 0 */ -} -- 2.47.2