diff options
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/paravirt.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/paravirt_types.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/setup.h | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index 1caf25b91e6b..7ce415e844b6 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h | |||
@@ -345,12 +345,6 @@ static inline void setup_secondary_clock(void) | |||
345 | } | 345 | } |
346 | #endif | 346 | #endif |
347 | 347 | ||
348 | static inline void paravirt_post_allocator_init(void) | ||
349 | { | ||
350 | if (pv_init_ops.post_allocator_init) | ||
351 | (*pv_init_ops.post_allocator_init)(); | ||
352 | } | ||
353 | |||
354 | #ifdef CONFIG_SMP | 348 | #ifdef CONFIG_SMP |
355 | static inline void startup_ipi_hook(int phys_apicid, unsigned long start_eip, | 349 | static inline void startup_ipi_hook(int phys_apicid, unsigned long start_eip, |
356 | unsigned long start_esp) | 350 | unsigned long start_esp) |
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 4039eefd3ebc..ecc74e5ad407 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h | |||
@@ -78,9 +78,6 @@ struct pv_init_ops { | |||
78 | */ | 78 | */ |
79 | unsigned (*patch)(u8 type, u16 clobber, void *insnbuf, | 79 | unsigned (*patch)(u8 type, u16 clobber, void *insnbuf, |
80 | unsigned long addr, unsigned len); | 80 | unsigned long addr, unsigned len); |
81 | |||
82 | /* Basic arch-specific setup */ | ||
83 | void (*post_allocator_init)(void); | ||
84 | }; | 81 | }; |
85 | 82 | ||
86 | 83 | ||
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 7751d1f92bc9..58b58952b80d 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h | |||
@@ -63,10 +63,6 @@ static inline int is_visws_box(void) { return 0; } | |||
63 | extern struct x86_quirks *x86_quirks; | 63 | extern struct x86_quirks *x86_quirks; |
64 | extern unsigned long saved_video_mode; | 64 | extern unsigned long saved_video_mode; |
65 | 65 | ||
66 | #ifndef CONFIG_PARAVIRT | ||
67 | #define paravirt_post_allocator_init() do {} while (0) | ||
68 | #endif | ||
69 | |||
70 | extern void reserve_standard_io_resources(void); | 66 | extern void reserve_standard_io_resources(void); |
71 | extern void i386_reserve_resources(void); | 67 | extern void i386_reserve_resources(void); |
72 | 68 | ||