diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-01 04:01:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-01 04:01:39 -0400 |
| commit | 23db9f430be9325a861c7762c1ffadad9ca528a8 (patch) | |
| tree | 1ebb681611c96f17aa4f96e28d6923824a8b210f /arch/x86/xen/xen-ops.h | |
| parent | 27b9613b7be39412775d0ab80f57229aa73bb07d (diff) | |
| parent | 3218911f839b6c85acbf872ad264ea69aa4d89ad (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: merge almost-rc8 into perfcounters/core, which was -rc6
based - to pick up the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/xen/xen-ops.h')
| -rw-r--r-- | arch/x86/xen/xen-ops.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 20139464943c..ca6596b05d53 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
| @@ -62,15 +62,26 @@ void xen_setup_vcpu_info_placement(void); | |||
| 62 | #ifdef CONFIG_SMP | 62 | #ifdef CONFIG_SMP |
| 63 | void xen_smp_init(void); | 63 | void xen_smp_init(void); |
| 64 | 64 | ||
| 65 | void __init xen_init_spinlocks(void); | ||
| 66 | __cpuinit void xen_init_lock_cpu(int cpu); | ||
| 67 | void xen_uninit_lock_cpu(int cpu); | ||
| 68 | |||
| 69 | extern cpumask_var_t xen_cpu_initialized_map; | 65 | extern cpumask_var_t xen_cpu_initialized_map; |
| 70 | #else | 66 | #else |
| 71 | static inline void xen_smp_init(void) {} | 67 | static inline void xen_smp_init(void) {} |
| 72 | #endif | 68 | #endif |
| 73 | 69 | ||
| 70 | #ifdef CONFIG_PARAVIRT_SPINLOCKS | ||
| 71 | void __init xen_init_spinlocks(void); | ||
| 72 | __cpuinit void xen_init_lock_cpu(int cpu); | ||
| 73 | void xen_uninit_lock_cpu(int cpu); | ||
| 74 | #else | ||
| 75 | static inline void xen_init_spinlocks(void) | ||
| 76 | { | ||
| 77 | } | ||
| 78 | static inline void xen_init_lock_cpu(int cpu) | ||
| 79 | { | ||
| 80 | } | ||
| 81 | static inline void xen_uninit_lock_cpu(int cpu) | ||
| 82 | { | ||
| 83 | } | ||
| 84 | #endif | ||
| 74 | 85 | ||
| 75 | /* Declare an asm function, along with symbols needed to make it | 86 | /* Declare an asm function, along with symbols needed to make it |
| 76 | inlineable */ | 87 | inlineable */ |