- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

[linux-flexiantxendom0-3.2.10.git] / drivers / oprofile / cpu_buffer.h

diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h
index fbadfbf..49900d9 100644 (file)
--- a/drivers/oprofile/cpu_buffer.h
+++ b/drivers/oprofile/cpu_buffer.h
@@ -36,7 +36,7 @@ struct oprofile_cpu_buffer {
        volatile unsigned long tail_pos;
        unsigned long buffer_size;
        struct task_struct * last_task;
-       int last_cpu_mode;
+       int last_is_kernel;
        int tracing;
        struct op_sample * buffer;
        unsigned long sample_received;
@@ -51,10 +51,7 @@ extern struct oprofile_cpu_buffer cpu_buffer[];
 void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf);
 
 /* transient events for the CPU buffer -> event buffer */
-#define CPU_MODE_USER           0
-#define CPU_MODE_KERNEL         1
-#define CPU_MODE_XEN            2
-#define CPU_TRACE_BEGIN         3
-#define CPU_DOMAIN_SWITCH       4
+#define CPU_IS_KERNEL 1
+#define CPU_TRACE_BEGIN 2
 
 #endif /* OPROFILE_CPU_BUFFER_H */