Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...

[linux-2.6.git] / include / asm-x86_64 / ipi.h

diff --git a/include/asm-x86_64/ipi.h b/include/asm-x86_64/ipi.h
index 2a5c162..be4bc76 100644 (file)
--- a/include/asm-x86_64/ipi.h
+++ b/include/asm-x86_64/ipi.h
@@ -49,6 +49,7 @@ static inline int __prepare_ICR2 (unsigned int mask)
        return SET_APIC_DEST_FIELD(mask);
 }
 
+#ifndef CONFIG_XEN_UNPRIVILEGED_GUEST
 static inline void __send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest)
 {
        /*
@@ -113,5 +114,6 @@ static inline void send_IPI_mask_sequence(cpumask_t mask, int vector)
        }
        local_irq_restore(flags);
 }
+#endif /* CONFIG_XEN_UNPRIVILEGED_GUEST */
 
 #endif /* __ASM_IPI_H */