linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / oprofile / event_buffer.h

diff --git a/drivers/oprofile/event_buffer.h b/drivers/oprofile/event_buffer.h
index 6a88788..0180236 100644 (file)
--- a/drivers/oprofile/event_buffer.h
+++ b/drivers/oprofile/event_buffer.h
@@ -11,7 +11,7 @@
 #define EVENT_BUFFER_H
 
 #include <linux/types.h> 
-#include <asm/mutex.h>
+#include <asm/semaphore.h>
  
 int alloc_event_buffer(void);
 
@@ -29,20 +29,15 @@ void wake_up_buffer_waiter(void);
 #define CPU_SWITCH_CODE                2
 #define COOKIE_SWITCH_CODE             3
 #define KERNEL_ENTER_SWITCH_CODE       4
-#define USER_ENTER_SWITCH_CODE         5
+#define KERNEL_EXIT_SWITCH_CODE                5
 #define MODULE_LOADED_CODE             6
 #define CTX_TGID_CODE                  7
 #define TRACE_BEGIN_CODE               8
 #define TRACE_END_CODE                 9
-#define XEN_ENTER_SWITCH_CODE          10
-#define DOMAIN_SWITCH_CODE             11
  
 #define INVALID_COOKIE ~0UL
 #define NO_COOKIE 0UL
 
-/* Constant used to refer to coordinator domain (Xen) */
-#define COORDINATOR_DOMAIN -1
-
 /* add data to the event buffer */
 void add_event_entry(unsigned long data);
  
@@ -51,6 +46,6 @@ extern struct file_operations event_buffer_fops;
 /* mutex between sync_cpu_buffers() and the
  * file reading code.
  */
-extern struct mutex buffer_mutex;
+extern struct semaphore buffer_sem;
  
 #endif /* EVENT_BUFFER_H */