Patched in Tegra support.

1 files changed, 3 insertions, 12 deletions

diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 23cb34ff397..a2a29205cc0 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
  *  Copyright (C) 2008-2011 Red Hat, Inc., Ingo Molnar
  *  Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
- *  Copyright  ©  2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
+ *  Copyright  ©  2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
  *
  * For licensing details see kernel-base/COPYING
  */
@@ -182,16 +182,10 @@ out:
         return -ENOSPC;
 }
 
-unsigned int perf_output_copy(struct perf_output_handle *handle,
+void perf_output_copy(struct perf_output_handle *handle,
                       const void *buf, unsigned int len)
 {
-        return __output_copy(handle, buf, len);
-}
-
-unsigned int perf_output_skip(struct perf_output_handle *handle,
-                              unsigned int len)
-{
-        return __output_skip(handle, NULL, len);
+        __output_copy(handle, buf, len);
 }
 
 void perf_output_end(struct perf_output_handle *handle)
@@ -215,9 +209,6 @@ ring_buffer_init(struct ring_buffer *rb, long watermark, int flags)
                 rb->writable = 1;
 
         atomic_set(&rb->refcount, 1);
-
-        INIT_LIST_HEAD(&rb->event_list);
-        spin_lock_init(&rb->event_lock);
 }
 
 #ifndef CONFIG_PERF_USE_VMALLOC