3 files changed, 45 insertions, 1 deletions

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index ed982273fb8b..37681700b61a 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -628,3 +628,27 @@ void sync_buffer(int cpu)
 
         mutex_unlock(&buffer_mutex);
 }
+
+/* The function can be used to add a buffer worth of data directly to
+ * the kernel buffer. The buffer is assumed to be a circular buffer.
+ * Take the entries from index start and end at index end, wrapping
+ * at max_entries.
+ */
+void oprofile_put_buff(unsigned long *buf, unsigned int start,
+                       unsigned int stop, unsigned int max)
+{
+        int i;
+
+        i = start;
+
+        mutex_lock(&buffer_mutex);
+        while (i != stop) {
+                add_event_entry(buf[i++]);
+
+                if (i >= max)
+                        i = 0;
+        }
+
+        mutex_unlock(&buffer_mutex);
+}
+
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index e1bd5a937f6c..7ba39fe20a8a 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -38,13 +38,26 @@ static int work_enabled;
 void free_cpu_buffers(void)
 {
         int i;
- 
+
         for_each_online_cpu(i) {
                 vfree(per_cpu(cpu_buffer, i).buffer);
                 per_cpu(cpu_buffer, i).buffer = NULL;
         }
 }
 
+unsigned long oprofile_get_cpu_buffer_size(void)
+{
+        return fs_cpu_buffer_size;
+}
+
+void oprofile_cpu_buffer_inc_smpl_lost(void)
+{
+        struct oprofile_cpu_buffer *cpu_buf
+                = &__get_cpu_var(cpu_buffer);
+
+        cpu_buf->sample_lost_overflow++;
+}
+
 int alloc_cpu_buffers(void)
 {
         int i;
diff --git a/drivers/oprofile/event_buffer.h b/drivers/oprofile/event_buffer.h
index 5076ed1ebd8f..84bf324c5771 100644
--- a/drivers/oprofile/event_buffer.h
+++ b/drivers/oprofile/event_buffer.h
@@ -17,6 +17,13 @@ int alloc_event_buffer(void);
 
 void free_event_buffer(void);
  
+/**
+ * Add data to the event buffer.
+ * The data passed is free-form, but typically consists of
+ * file offsets, dcookies, context information, and ESCAPE codes.
+ */
+void add_event_entry(unsigned long data);
+
 /* wake up the process sleeping on the event file */
 void wake_up_buffer_waiter(void);