diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/xen/xen-ops.h | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/xen/xen-ops.h')
-rw-r--r-- | arch/x86/xen/xen-ops.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 7c8ab86163e9..97dfdc8757b3 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
@@ -30,6 +30,9 @@ void xen_setup_machphys_mapping(void); | |||
30 | pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn); | 30 | pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn); |
31 | void xen_ident_map_ISA(void); | 31 | void xen_ident_map_ISA(void); |
32 | void xen_reserve_top(void); | 32 | void xen_reserve_top(void); |
33 | extern unsigned long xen_max_p2m_pfn; | ||
34 | |||
35 | void xen_set_pat(u64); | ||
33 | 36 | ||
34 | char * __init xen_memory_setup(void); | 37 | char * __init xen_memory_setup(void); |
35 | void __init xen_arch_setup(void); | 38 | void __init xen_arch_setup(void); |
@@ -40,7 +43,7 @@ void xen_vcpu_restore(void); | |||
40 | 43 | ||
41 | void xen_callback_vector(void); | 44 | void xen_callback_vector(void); |
42 | void xen_hvm_init_shared_info(void); | 45 | void xen_hvm_init_shared_info(void); |
43 | void __init xen_unplug_emulated_devices(void); | 46 | void xen_unplug_emulated_devices(void); |
44 | 47 | ||
45 | void __init xen_build_dynamic_phys_to_machine(void); | 48 | void __init xen_build_dynamic_phys_to_machine(void); |
46 | 49 | ||
@@ -61,15 +64,17 @@ void xen_setup_vcpu_info_placement(void); | |||
61 | 64 | ||
62 | #ifdef CONFIG_SMP | 65 | #ifdef CONFIG_SMP |
63 | void xen_smp_init(void); | 66 | void xen_smp_init(void); |
67 | void __init xen_hvm_smp_init(void); | ||
64 | 68 | ||
65 | extern cpumask_var_t xen_cpu_initialized_map; | 69 | extern cpumask_var_t xen_cpu_initialized_map; |
66 | #else | 70 | #else |
67 | static inline void xen_smp_init(void) {} | 71 | static inline void xen_smp_init(void) {} |
72 | static inline void xen_hvm_smp_init(void) {} | ||
68 | #endif | 73 | #endif |
69 | 74 | ||
70 | #ifdef CONFIG_PARAVIRT_SPINLOCKS | 75 | #ifdef CONFIG_PARAVIRT_SPINLOCKS |
71 | void __init xen_init_spinlocks(void); | 76 | void __init xen_init_spinlocks(void); |
72 | __cpuinit void xen_init_lock_cpu(int cpu); | 77 | void __cpuinit xen_init_lock_cpu(int cpu); |
73 | void xen_uninit_lock_cpu(int cpu); | 78 | void xen_uninit_lock_cpu(int cpu); |
74 | #else | 79 | #else |
75 | static inline void xen_init_spinlocks(void) | 80 | static inline void xen_init_spinlocks(void) |