From patchwork Sat May 18 11:58:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13667593 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 EF229C25B7A for ; Sat, 18 May 2024 11:58:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7EC2C6B0083; Sat, 18 May 2024 07:58:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74FBC6B0085; Sat, 18 May 2024 07:58:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 579246B0088; Sat, 18 May 2024 07:58:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3B1966B0083 for ; Sat, 18 May 2024 07:58:27 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CF1C0160727 for ; Sat, 18 May 2024 11:58:26 +0000 (UTC) X-FDA: 82131369012.24.33A1841 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf29.hostedemail.com (Postfix) with ESMTP id E2092120016 for ; Sat, 18 May 2024 11:58:24 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; spf=pass (imf29.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716033505; 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; bh=3dmpmmUMhLh5gbOtWlnpoRn1m+Q/8aZAwkE9zaahtAw=; b=7YWBwuU9PKIv1z3wRq2HUZ7U4nJ1pOun5omQJ6rnYa7Dh6xcz6MFr5SvGVsvz+/d2UWJg7 yCNP9hDMIV9QnNQ0FfmskrB/uaMYoTNceHmeWjf91mPzUb3QbC5nPr+dtV74Wm6UgMSTuY I0Yl9eup7LtGPpIN6t+PW8PVvpmyNYc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716033505; a=rsa-sha256; cv=none; b=lKwPL589Ube2oi73pKJC1gtC/V1A9GKigK+dRoHJc6pNoHdrHt5wFNjN/TzhaFN02lP/FY NGXuqn2QkTVYzvbcT4k8U7xq4vOJmvTt00osq1rOyuITMiciRXSjgVIV4YSMZDpgT9TXEs foVJSD5yyYpsYx3MSJ5ipyoSvuGBxeE= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; spf=pass (imf29.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 41F9D22385; Sat, 18 May 2024 11:58:23 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D999B134C3; Sat, 18 May 2024 11:58:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id ANmPMt6XSGb8MwAAD6G6ig (envelope-from ); Sat, 18 May 2024 11:58:22 +0000 From: Oscar Salvador To: linux-sh@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , John Paul Adrian Glaubitz , Geert Uytterhoeven , Oscar Salvador Subject: [PATCH 1/2] arch/sh: Remove code that handles memory-hotplug and memory-hotremove Date: Sat, 18 May 2024 13:58:07 +0200 Message-ID: <20240518115808.8888-2-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240518115808.8888-1-osalvador@suse.de> References: <20240518115808.8888-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Rspam-User: X-Stat-Signature: pit5gseieh8rqicoj7pmb8ncr1ab691r X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E2092120016 X-HE-Tag: 1716033504-986799 X-HE-Meta: U2FsdGVkX1+ImM1hBuY71uBW1Sa+oo70VeHv+k9qLMzC7X7uXpnSlxEcZUxiFtuBE5eMQ27a/GdN76tBANVl8t5g3VRQJqMxhaRQcK8olGXrRCWj/aMfiQvCQvdpwO4MN1z9+i3Bs52jLSExOHbsbVGOc319b5VJTH+gb3UAhTjEhPZCom/wqAnq3MgdHhyYA9xzVQh/tbBhHhsBJ64ckq1fGp4cqgL03KIx7HdHlYKD5SmSAqe/nNOr/afBtS1CjySmpHvDXjuHJS6tTbyEqrkc0C0CYjdxduFpLIMxEInanFaEXWpADFAiMLAeITxF/gZ3eiYXXBlp6f1z/jko0wkPGtc8K4hnFUip34DN5h+0Ba3t9HdUfuOvXBCnZrh8ksS0lq66eA2VRfuOJkxQc2KfeYv1KV3HhWiEsPvVuKorTB1JLVvrM1SlAXLVqED1SLhJju/FsjMVZDgDmARuZNxTR7i0dBocTq6la2C/UctUH62CsVLIdFkT6gvjH5BLTlhWAx6JYsyy7oP7VmXh8Z6VW9lag/AfaYq6R0QMnvqxiUuI/8GG4dHG1QK9M0dAcRkbMbM03YtKhRDO8MfW/qKDD3pgrFMca9Cir2MCQut08Dm879n9FmDP51kvOe0KhkKBOQ+Os5hYjwCp66wY3pv6jdxTvMYx8h/sQvTk+8VeV7SXybaACXwzpFGlVOzfE9stedCWQfmsoPJkMbKokcPGcUnYuXxjoBtktn8/KyhN4mS9cLJyyLFmohax3V4sFT9t/LnAgzVf9avg8m67UtAiBPRuz5LxdAi6gec0QmNvQ7Ng7Idqs+70w0y5A/gXLZyntJxk6CpTuVhOqyLDJAz2iIH5+fMOSsAaWiE6RDoa/TLnv37Fp9EBrkebxq5PGwMXUNZqrjowOiDHOt+IzsM1+ChVWeOzXWFHtJrUV2WxWIZ/M4UZd6QXKf9bMGlfnWXDNKeIqCAb17dhYqY ei/7kGwr JhmWGnRCevr69MUtB8NnJkr04bgAyqW2+n1X0i4YNXIWyQsGoDD//DYAGCiq+K8dYpA3KH2e36mVPL53vc3KP1lIR2qJ2Chb8txoQRhjqMWicQhBlU/oljRtReaQnPN6rljnsViKo7y8EYOVQGYQ3ERU+3f6BBtsANFPQMWLM3kypvMIutu86A5cNxtorAu37pyb0VijldMW2tEo= 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: Since commit 7ec58a2b941ed889("mm/memory_hotplug: restrict CONFIG_MEMORY_HOTPLUG to 64 bit"), we only support memory-hotplug on 64bits platforms, but currently superH can only run on 32bit, so remove the code that handles memory-hotplug and memory-hotremove as that cannot work. Signed-off-by: Oscar Salvador Reviewed-by: John Paul Adrian Glaubitz --- arch/sh/mm/init.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index bf1b54055316..d1fe90b2f5ff 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -395,31 +395,3 @@ void __init mem_init(void) mem_init_done = 1; } - -#ifdef CONFIG_MEMORY_HOTPLUG -int arch_add_memory(int nid, u64 start, u64 size, - struct mhp_params *params) -{ - unsigned long start_pfn = PFN_DOWN(start); - unsigned long nr_pages = size >> PAGE_SHIFT; - int ret; - - if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot)) - return -EINVAL; - - /* We only have ZONE_NORMAL, so this is easy.. */ - ret = __add_pages(nid, start_pfn, nr_pages, params); - if (unlikely(ret)) - printk("%s: Failed, __add_pages() == %d\n", __func__, ret); - - return ret; -} - -void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) -{ - unsigned long start_pfn = PFN_DOWN(start); - unsigned long nr_pages = size >> PAGE_SHIFT; - - __remove_pages(start_pfn, nr_pages, altmap); -} -#endif /* CONFIG_MEMORY_HOTPLUG */ From patchwork Sat May 18 11:58:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13667594 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 F1F56C25B74 for ; Sat, 18 May 2024 11:58:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 888FB6B0085; Sat, 18 May 2024 07:58:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7EBA16B0088; Sat, 18 May 2024 07:58:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 52C816B0089; Sat, 18 May 2024 07:58:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 306D26B0085 for ; Sat, 18 May 2024 07:58:28 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C85B816071A for ; Sat, 18 May 2024 11:58:27 +0000 (UTC) X-FDA: 82131369054.12.2584B36 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf30.hostedemail.com (Postfix) with ESMTP id ABE4080002 for ; Sat, 18 May 2024 11:58:25 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mdHghlQa; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=P7IBKm9c; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mdHghlQa; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=P7IBKm9c; spf=pass (imf30.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716033506; 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=jnDpm4EKbhBQ/1NKuX0gOKB+WHDPt4tjZ4vg0QkyK50=; b=oORmLOtXZ60HEMkRHxXXJvmAhTeNRId20KjMUvD40R2dpiH0htWFDLkRGZZcGZWPmXKvG5 sfw0mEVzVKjhpNWKn45Ru6JTycEdceoM12dVfuZAq6EP6enDXawPlxyOse4062ukYWk93W drsvUmdIwgpONLN8EqQ//FWnGs7eauU= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mdHghlQa; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=P7IBKm9c; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mdHghlQa; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=P7IBKm9c; spf=pass (imf30.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716033506; a=rsa-sha256; cv=none; b=G8t2EFJgUE9M2p2m1RUvzb2112VgKNWP0TMOv0g3RCSf9DkR9uupRGLzhtcdil7E4mWY6u EubjtmYzi9yCoucg67j/b59PNKTCCm0tfh7SCdRLWvgUUDWT9t7Iiojv4s2dxFcLKzhei1 P9zFls+A7qWDu7ulm7K3k8UHhwkKg0k= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 4927B5FAAC; Sat, 18 May 2024 11:58:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716033504; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jnDpm4EKbhBQ/1NKuX0gOKB+WHDPt4tjZ4vg0QkyK50=; b=mdHghlQaqx7ywTnj8CKiM/v/kQzMWO5czWRqScUwkH1rx7T5Dw922Hcrlo2JwN/JuNCwKA gf/t4f/LbbJ/E9/fA+X2uzhxFfi8vpOFKxCdTBb0mHs2hoDtruQNKbfENTKg4lMB+Nsp/o Yga+B/iXjdoimsU0kovJCQawCo9iGpI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716033504; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jnDpm4EKbhBQ/1NKuX0gOKB+WHDPt4tjZ4vg0QkyK50=; b=P7IBKm9ceE6mad/2XdhmmJAVBSyMX0whFb8GL9zYHb0TjJOcizp5OYz70kawkT/T6Xx7Xh KHmPpTdPuAD2KnAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716033504; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jnDpm4EKbhBQ/1NKuX0gOKB+WHDPt4tjZ4vg0QkyK50=; b=mdHghlQaqx7ywTnj8CKiM/v/kQzMWO5czWRqScUwkH1rx7T5Dw922Hcrlo2JwN/JuNCwKA gf/t4f/LbbJ/E9/fA+X2uzhxFfi8vpOFKxCdTBb0mHs2hoDtruQNKbfENTKg4lMB+Nsp/o Yga+B/iXjdoimsU0kovJCQawCo9iGpI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716033504; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jnDpm4EKbhBQ/1NKuX0gOKB+WHDPt4tjZ4vg0QkyK50=; b=P7IBKm9ceE6mad/2XdhmmJAVBSyMX0whFb8GL9zYHb0TjJOcizp5OYz70kawkT/T6Xx7Xh KHmPpTdPuAD2KnAw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id DFAEB134C3; Sat, 18 May 2024 11:58:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id ANzHM9+XSGb8MwAAD6G6ig (envelope-from ); Sat, 18 May 2024 11:58:23 +0000 From: Oscar Salvador To: linux-sh@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , John Paul Adrian Glaubitz , Geert Uytterhoeven , Oscar Salvador Subject: [PATCH 2/2] arch/sh: Drop support for memory-hotplug and memory-hotremove Date: Sat, 18 May 2024 13:58:08 +0200 Message-ID: <20240518115808.8888-3-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240518115808.8888-1-osalvador@suse.de> References: <20240518115808.8888-1-osalvador@suse.de> MIME-Version: 1.0 X-Stat-Signature: w6ouw6xeufu1uh7mgbsixbcxhmbm5ncy X-Rspamd-Queue-Id: ABE4080002 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1716033505-402726 X-HE-Meta: U2FsdGVkX196E+KKjkqwHcg4y5e37haq/KzeX3wQWxAPxdMP8jTSNkQnHunDvdg/NMigP8HtKgL4r9YSzyRXhZC/3vd+bN0GIt+JTu+TNVAhhwEUOfdEzlSZSrlTOOd5EBLP2qj349ISjml+3Q0VFywbAb81I3eOdZvVI98BeiPXHNzCDR9Q7C7AZWTZ5QXGDY7Pxk+hYwAkaKASXUPnskN7D0gNi5bcRliZ7BJraRxa02FX4UH7Hwf9lwzIlWj3u2E9Nq5gZunVDD3GQLHiCpI89DDNAWk7pctIZlHoXdMl6+2dmSfB0frydAAEjzmI2sZVAvGA++QG3Gq6dGzIDeOjVY3LONLADtt2B/aoFXVmL1FyyRgyqZGbZ34uAHWX7HLpN9ADVZAxzi0yZT2NELwlslL9TCOxRjt2AKWbZEQRMD9VLXuSbM/Q/xiGtAzOT5Ewi1teJA9vQ63xij/Fe4DRKJs152hvtlY6qv6GFbgCe800hc9zDq02IVE1djgPnJrsI/QKB3fjUWbaCNzJmZ3I/e5JXDkTwv6Le4mpqIfr5Vy7yYjlj7dXPCu+ZaWCoLApdYzU3exLRAeOpN7zM/8hhXvBvWz17/75Wr77LOVt/Rzinu6+hg0dNqvT2bjBEJA5yOmyzRj+Ox4n6fLKbPz1FSieuKmO7ZJPP+6gsUnGDYxYqfsVIN2opVTlaqCos4j5wvMdR4Zs1Ei4/6P9zZ17Qa1knO3jkyYlbtY0N1xgDMsUl/oJ2KTv1rRya0tBLT6ae24I7wcJjddMs363uluOYKfolKxiXpGzv3yudPfgiPaqCHLuHA/dW5esUxTcW6qHPaogVbx90jqdA0MC/af8zQIzTzNkIsm04AN8y2EdhfmW4UKZ9Cqycwa3GLDxpLvHlepQNifpFz8MjHYKRybmt9iZRZV2h3KIZVul1TOde5F8IFrruLbD/D6C1RLsw0mw2OJwx43lL5Glbzc lpHOVPE7 s8D24hI1j7Tut0YiZFnHDtG/Q5uF4aBfLg5cgQtfURgYEPpg1ff+VNrgoOdSIT4fRoTtXkpw2wE3O1KVVmjsM1+VZVgn/NmxXrfGIxJmZGuqMmKGbTVvBnp6EBh/mhKN1CAAed8Nge3YyvY0TBiZf0EVSkkj4hmCs2KCzeIkiMBBMTGqTXKWLsfctCkQ3H3ESOHT0/CTcbf9mHIqGbGikAOx6LagHIkcZ+AwzYdvmk69I3iXi9SD+u55OHs++GHv6uqOYRXiIVOulDLKwrs2Dy0/5oI9sCesZiZuDtrFRycKnfFYl4MMan15/6w== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000014, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Remove all CONFIG options related to memory-hotplug and memory-hotremove. Signed-off-by: Oscar Salvador Reviewed-by: John Paul Adrian Glaubitz --- arch/sh/Kconfig | 2 -- arch/sh/configs/apsh4ad0a_defconfig | 2 -- arch/sh/configs/sdk7786_defconfig | 2 -- arch/sh/configs/shx3_defconfig | 2 -- arch/sh/mm/Kconfig | 4 ---- 5 files changed, 12 deletions(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 6bc60f964f96..c5c093c73aa1 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -3,8 +3,6 @@ config SUPERH def_bool y select ARCH_32BIT_OFF_T select ARCH_HAS_CPU_CACHE_ALIASING - select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM && MMU - select ARCH_ENABLE_MEMORY_HOTREMOVE if SPARSEMEM && MMU select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A) select ARCH_HAS_BINFMT_FLAT if !MMU select ARCH_HAS_CPU_FINALIZE_INIT diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig index 64558bf60e10..19ed0601a36f 100644 --- a/arch/sh/configs/apsh4ad0a_defconfig +++ b/arch/sh/configs/apsh4ad0a_defconfig @@ -24,8 +24,6 @@ CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_CPU_SUBTYPE_SH7786=y CONFIG_MEMORY_SIZE=0x10000000 CONFIG_HUGETLB_PAGE_SIZE_1MB=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTREMOVE=y CONFIG_KSM=y CONFIG_SH_STORE_QUEUES=y CONFIG_SH_APSH4AD0A=y diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig index 7b427c17fbfe..07894f13441e 100644 --- a/arch/sh/configs/sdk7786_defconfig +++ b/arch/sh/configs/sdk7786_defconfig @@ -43,8 +43,6 @@ CONFIG_MEMORY_SIZE=0x20000000 CONFIG_PMB=y CONFIG_NUMA=y CONFIG_HUGETLB_PAGE_SIZE_64MB=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTREMOVE=y CONFIG_KSM=y CONFIG_SH_STORE_QUEUES=y CONFIG_SPECULATIVE_EXECUTION=y diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig index aa353dff7f19..9a0df5ea3866 100644 --- a/arch/sh/configs/shx3_defconfig +++ b/arch/sh/configs/shx3_defconfig @@ -31,8 +31,6 @@ CONFIG_CPU_SUBTYPE_SHX3=y CONFIG_MEMORY_START=0x0c000000 CONFIG_NUMA=y CONFIG_PAGE_SIZE_64KB=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_MEMORY_HOTREMOVE=y CONFIG_SH_STORE_QUEUES=y CONFIG_SH_X3PROTO=y CONFIG_NO_HZ=y diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index f32a1963ff0c..1862411665ab 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig @@ -144,10 +144,6 @@ config ARCH_SPARSEMEM_DEFAULT config ARCH_SELECT_MEMORY_MODEL def_bool y -config ARCH_MEMORY_PROBE - def_bool y - depends on MEMORY_HOTPLUG - config IOREMAP_FIXED def_bool y depends on X2TLB