File tree Expand file tree Collapse file tree 2 files changed +9
-11
lines changed Expand file tree Collapse file tree 2 files changed +9
-11
lines changed Original file line number Diff line number Diff line change @@ -23,12 +23,10 @@ extern int of_ioapic;
23
23
extern u64 initial_dtb ;
24
24
extern void add_dtb (u64 data );
25
25
void x86_of_pci_init (void );
26
- void x86_dtb_parse_smp_config (void );
27
26
void x86_flattree_get_config (void );
28
27
#else
29
28
static inline void add_dtb (u64 data ) { }
30
29
static inline void x86_of_pci_init (void ) { }
31
- static inline void x86_dtb_parse_smp_config (void ) { }
32
30
static inline void x86_flattree_get_config (void ) { }
33
31
#define of_ioapic 0
34
32
#endif
Original file line number Diff line number Diff line change @@ -279,6 +279,15 @@ static void __init dtb_apic_setup(void)
279
279
dtb_ioapic_setup ();
280
280
}
281
281
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
+
282
291
void __init x86_flattree_get_config (void )
283
292
{
284
293
#ifdef CONFIG_OF_EARLY_FLATTREE
@@ -307,12 +316,3 @@ void __init x86_flattree_get_config(void)
307
316
if (of_have_populated_dt ())
308
317
x86_init .mpparse .parse_smp_cfg = x86_dtb_parse_smp_config ;
309
318
}
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
- }
You can’t perform that action at this time.
0 commit comments