From: "tip-bot2 for Saurabh Sengar" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Saurabh Sengar <ssengar@linux.microsoft.com>,
Ingo Molnar <mingo@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/platform] x86/of: Change x86_dtb_parse_smp_config() to static
Date: Wed, 03 Apr 2024 06:59:50 -0000 [thread overview]
Message-ID: <171212759058.10875.1562775554694124882.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1712068830-4513-5-git-send-email-ssengar@linux.microsoft.com>
The following commit has been merged into the x86/platform branch of tip:
Commit-ID: f87136c05714836f1b659365443caccc1bbfce2d
Gitweb: https://git.kernel.org/tip/f87136c05714836f1b659365443caccc1bbfce2d
Author: Saurabh Sengar <ssengar@linux.microsoft.com>
AuthorDate: Tue, 02 Apr 2024 07:40:30 -07:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 03 Apr 2024 08:49:56 +02:00
x86/of: Change x86_dtb_parse_smp_config() to static
x86_dtb_parse_smp_config() is called locally only, change it to static.
Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/1712068830-4513-5-git-send-email-ssengar@linux.microsoft.com
---
arch/x86/include/asm/prom.h | 2 --
arch/x86/kernel/devicetree.c | 18 +++++++++---------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index 02644e0..365798c 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -23,12 +23,10 @@ extern int of_ioapic;
extern u64 initial_dtb;
extern void add_dtb(u64 data);
void x86_of_pci_init(void);
-void x86_dtb_parse_smp_config(void);
void x86_flattree_get_config(void);
#else
static inline void add_dtb(u64 data) { }
static inline void x86_of_pci_init(void) { }
-static inline void x86_dtb_parse_smp_config(void) { }
static inline void x86_flattree_get_config(void) { }
#define of_ioapic 0
#endif
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index b93ce8a..8e3c53b 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -279,6 +279,15 @@ static void __init dtb_apic_setup(void)
dtb_ioapic_setup();
}
+static void __init x86_dtb_parse_smp_config(void)
+{
+ if (!of_have_populated_dt())
+ return;
+
+ dtb_setup_hpet();
+ dtb_apic_setup();
+}
+
void __init x86_flattree_get_config(void)
{
#ifdef CONFIG_OF_EARLY_FLATTREE
@@ -307,12 +316,3 @@ void __init x86_flattree_get_config(void)
if (of_have_populated_dt())
x86_init.mpparse.parse_smp_cfg = x86_dtb_parse_smp_config;
}
-
-void __init x86_dtb_parse_smp_config(void)
-{
- if (!of_have_populated_dt())
- return;
-
- dtb_setup_hpet();
- dtb_apic_setup();
-}
prev parent reply other threads:[~2024-04-03 6:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 14:40 [PATCH v2 0/4] Fixing SMP config for DeviceTree platforms Saurabh Sengar
2024-04-02 14:40 ` [PATCH v2 1/4] x86/hyperv/vtl: Correct parse_smp_cfg assignment Saurabh Sengar
2024-04-03 6:59 ` [tip: x86/platform] x86/hyperv/vtl: Correct x86_init.mpparse.parse_smp_cfg assignment tip-bot2 for Saurabh Sengar
2024-04-04 23:58 ` [PATCH v2 1/4] x86/hyperv/vtl: Correct parse_smp_cfg assignment Wei Liu
2024-04-02 14:40 ` [PATCH v2 2/4] x86/of: Set the parse_smp_cfg for all the DeviceTree platforms by default Saurabh Sengar
2024-04-03 6:59 ` [tip: x86/platform] " tip-bot2 for Saurabh Sengar
2024-04-02 14:40 ` [PATCH v2 3/4] x86/of: Map NUMA node to CPUs as per DeviceTree Saurabh Sengar
2024-04-03 6:59 ` [tip: x86/platform] " tip-bot2 for Saurabh Sengar
2024-04-02 14:40 ` [PATCH v2 4/4] x86/of: Change x86_dtb_parse_smp_config to static Saurabh Sengar
2024-04-03 6:59 ` tip-bot2 for Saurabh Sengar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=171212759058.10875.1562775554694124882.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=ssengar@linux.microsoft.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®