commit 5f83a329fe07bdfcb6ced6de35f6fc68b22b99e0
Author: Jose Renato Santos <jsantos@xxxxxxxxxx>
Date:   Wed Jun 24 18:18:41 2009 -0700

    Fix OProfile escape code collision between Xenoprof's
    DOMAIN_SWITCH_CODE (in use on x86 and ia64) and Cell's
    SPU_PROFILING_CODE(in use with Power).
    
    Signed-off-by: Jose Renato Santos <jsantos@xxxxxxxxxx>

diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index bb8a349..8863734 100644
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
@@ -37,9 +37,18 @@
 #define TRACE_BEGIN_CODE		8
 #define TRACE_END_CODE			9
 #define XEN_ENTER_SWITCH_CODE		10
+/*
+ * Ugly work-around for the unfortunate collision between Xenoprof's
+ * DOMAIN_SWITCH_CODE (in use on x86 and ia64) and Cell's SPU_PROFILING_CODE
+ * (in use with Power):
+ */
+#ifdef CONFIG_PPC
 #define SPU_PROFILING_CODE		11
 #define SPU_CTX_SWITCH_CODE		12
 #define DOMAIN_SWITCH_CODE		13
+#else
+#define DOMAIN_SWITCH_CODE		11
+#endif
 
 struct super_block;
 struct dentry;