Merge branch 'x86/oprofile' into oprofile

[linux-beck.git] / include / linux / oprofile.h

diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index 041bb31100f48fd780b9505cf21842be36cdb68f..687f2f4c36a1f16860a3c81f58fcf706fd86d367 100644 (file)
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
@@ -36,6 +36,8 @@
 #define XEN_ENTER_SWITCH_CODE          10
 #define SPU_PROFILING_CODE             11
 #define SPU_CTX_SWITCH_CODE            12
+#define IBS_FETCH_CODE                 13
+#define IBS_OP_CODE                    14
 
 struct super_block;
 struct dentry;
@@ -65,6 +67,9 @@ struct oprofile_operations {
 
        /* Initiate a stack backtrace. Optional. */
        void (*backtrace)(struct pt_regs * const regs, unsigned int depth);
+
+       /* Multiplex between different events. Optional. */
+       int (*switch_events)(void);
        /* CPU identification string. */
        char * cpu_type;
 };