Skip to content

Commit f87136c

Browse files
Saurabh SengarIngo Molnar
authored andcommitted
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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 85900d0 commit f87136c

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

arch/x86/include/asm/prom.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ extern int of_ioapic;
2323
extern u64 initial_dtb;
2424
extern void add_dtb(u64 data);
2525
void x86_of_pci_init(void);
26-
void x86_dtb_parse_smp_config(void);
2726
void x86_flattree_get_config(void);
2827
#else
2928
static inline void add_dtb(u64 data) { }
3029
static inline void x86_of_pci_init(void) { }
31-
static inline void x86_dtb_parse_smp_config(void) { }
3230
static inline void x86_flattree_get_config(void) { }
3331
#define of_ioapic 0
3432
#endif

arch/x86/kernel/devicetree.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,15 @@ static void __init dtb_apic_setup(void)
279279
dtb_ioapic_setup();
280280
}
281281

282+
static void __init x86_dtb_parse_smp_config(void)
283+
{
284+
if (!of_have_populated_dt())
285+
return;
286+
287+
dtb_setup_hpet();
288+
dtb_apic_setup();
289+
}
290+
282291
void __init x86_flattree_get_config(void)
283292
{
284293
#ifdef CONFIG_OF_EARLY_FLATTREE
@@ -307,12 +316,3 @@ void __init x86_flattree_get_config(void)
307316
if (of_have_populated_dt())
308317
x86_init.mpparse.parse_smp_cfg = x86_dtb_parse_smp_config;
309318
}
310-
311-
void __init x86_dtb_parse_smp_config(void)
312-
{
313-
if (!of_have_populated_dt())
314-
return;
315-
316-
dtb_setup_hpet();
317-
dtb_apic_setup();
318-
}

0 commit comments

Comments
 (0)