diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
| commit | 24f030175d30f019be41766cdf88c2ff03de19ff (patch) | |
| tree | 354232a84e82d5a721ed7b1a9af580ff2a59be8f /arch/x86/xen/xen-ops.h | |
| parent | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/x86/xen/xen-ops.h')
| -rw-r--r-- | arch/x86/xen/xen-ops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 9e1afae8461..c1f8faf0a2c 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
| @@ -58,7 +58,7 @@ void __init xen_init_spinlocks(void); | |||
| 58 | __cpuinit void xen_init_lock_cpu(int cpu); | 58 | __cpuinit void xen_init_lock_cpu(int cpu); |
| 59 | void xen_uninit_lock_cpu(int cpu); | 59 | void xen_uninit_lock_cpu(int cpu); |
| 60 | 60 | ||
| 61 | extern cpumask_t xen_cpu_initialized_map; | 61 | extern cpumask_var_t xen_cpu_initialized_map; |
| 62 | #else | 62 | #else |
| 63 | static inline void xen_smp_init(void) {} | 63 | static inline void xen_smp_init(void) {} |
| 64 | #endif | 64 | #endif |