diff options
Diffstat (limited to 'arch/x86/xen/xen-ops.h')
-rw-r--r-- | arch/x86/xen/xen-ops.h | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index f1063ae08037..dd3c23152a2e 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
@@ -9,22 +9,31 @@ | |||
9 | extern const char xen_hypervisor_callback[]; | 9 | extern const char xen_hypervisor_callback[]; |
10 | extern const char xen_failsafe_callback[]; | 10 | extern const char xen_failsafe_callback[]; |
11 | 11 | ||
12 | struct trap_info; | ||
12 | void xen_copy_trap_info(struct trap_info *traps); | 13 | void xen_copy_trap_info(struct trap_info *traps); |
13 | 14 | ||
14 | DECLARE_PER_CPU(unsigned long, xen_cr3); | 15 | DECLARE_PER_CPU(unsigned long, xen_cr3); |
15 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); | 16 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); |
16 | 17 | ||
17 | extern struct start_info *xen_start_info; | 18 | extern struct start_info *xen_start_info; |
19 | extern struct shared_info xen_dummy_shared_info; | ||
18 | extern struct shared_info *HYPERVISOR_shared_info; | 20 | extern struct shared_info *HYPERVISOR_shared_info; |
19 | 21 | ||
22 | void xen_setup_mfn_list_list(void); | ||
23 | void xen_setup_shared_info(void); | ||
24 | |||
20 | char * __init xen_memory_setup(void); | 25 | char * __init xen_memory_setup(void); |
21 | void __init xen_arch_setup(void); | 26 | void __init xen_arch_setup(void); |
22 | void __init xen_init_IRQ(void); | 27 | void __init xen_init_IRQ(void); |
23 | void xen_enable_sysenter(void); | 28 | void xen_enable_sysenter(void); |
29 | void xen_enable_syscall(void); | ||
30 | void xen_vcpu_restore(void); | ||
31 | |||
32 | void __init xen_build_dynamic_phys_to_machine(void); | ||
24 | 33 | ||
25 | void xen_setup_timer(int cpu); | 34 | void xen_setup_timer(int cpu); |
26 | void xen_setup_cpu_clockevents(void); | 35 | void xen_setup_cpu_clockevents(void); |
27 | unsigned long xen_cpu_khz(void); | 36 | unsigned long xen_tsc_khz(void); |
28 | void __init xen_time_init(void); | 37 | void __init xen_time_init(void); |
29 | unsigned long xen_get_wallclock(void); | 38 | unsigned long xen_get_wallclock(void); |
30 | int xen_set_wallclock(unsigned long time); | 39 | int xen_set_wallclock(unsigned long time); |
@@ -36,23 +45,15 @@ bool xen_vcpu_stolen(int vcpu); | |||
36 | 45 | ||
37 | void xen_mark_init_mm_pinned(void); | 46 | void xen_mark_init_mm_pinned(void); |
38 | 47 | ||
39 | void __init xen_fill_possible_map(void); | ||
40 | |||
41 | void __init xen_setup_vcpu_info_placement(void); | 48 | void __init xen_setup_vcpu_info_placement(void); |
42 | void xen_smp_prepare_boot_cpu(void); | ||
43 | void xen_smp_prepare_cpus(unsigned int max_cpus); | ||
44 | int xen_cpu_up(unsigned int cpu); | ||
45 | void xen_smp_cpus_done(unsigned int max_cpus); | ||
46 | 49 | ||
47 | void xen_smp_send_stop(void); | 50 | #ifdef CONFIG_SMP |
48 | void xen_smp_send_reschedule(int cpu); | 51 | void xen_smp_init(void); |
49 | int xen_smp_call_function (void (*func) (void *info), void *info, int nonatomic, | ||
50 | int wait); | ||
51 | int xen_smp_call_function_single(int cpu, void (*func) (void *info), void *info, | ||
52 | int nonatomic, int wait); | ||
53 | 52 | ||
54 | int xen_smp_call_function_mask(cpumask_t mask, void (*func)(void *), | 53 | extern cpumask_t xen_cpu_initialized_map; |
55 | void *info, int wait); | 54 | #else |
55 | static inline void xen_smp_init(void) {} | ||
56 | #endif | ||
56 | 57 | ||
57 | 58 | ||
58 | /* Declare an asm function, along with symbols needed to make it | 59 | /* Declare an asm function, along with symbols needed to make it |
@@ -67,7 +68,11 @@ DECL_ASM(void, xen_irq_disable_direct, void); | |||
67 | DECL_ASM(unsigned long, xen_save_fl_direct, void); | 68 | DECL_ASM(unsigned long, xen_save_fl_direct, void); |
68 | DECL_ASM(void, xen_restore_fl_direct, unsigned long); | 69 | DECL_ASM(void, xen_restore_fl_direct, unsigned long); |
69 | 70 | ||
71 | /* These are not functions, and cannot be called normally */ | ||
70 | void xen_iret(void); | 72 | void xen_iret(void); |
71 | void xen_sysexit(void); | 73 | void xen_sysexit(void); |
74 | void xen_sysret32(void); | ||
75 | void xen_sysret64(void); | ||
76 | void xen_adjust_exception_frame(void); | ||
72 | 77 | ||
73 | #endif /* XEN_OPS_H */ | 78 | #endif /* XEN_OPS_H */ |