From 3ed9a2f68315c2542792cb611d2a791fd78920d8 Mon Sep 17 00:00:00 2001
From: David Sharp <dhsharp@google.com>
Date: Thu, 7 Jun 2012 16:46:24 -0700
Subject: [PATCH] --- yaml --- r: 338997 b: refs/heads/master c:
 01e3e710a9265fb7092efd67243d7b6dd6e2548a h: refs/heads/master i:   338995:
 73420d753fb6a3bfe81a1cb369087fc55d0cf80b v: v3

---
 [refs]                           | 2 +-
 trunk/include/trace/syscall.h    | 2 --
 trunk/kernel/trace/ring_buffer.c | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b12e5b8b7cda..3c057e1aedd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ffbd48d5cab22bcd1120eb2349db1319e2d827a
+refs/heads/master: 01e3e710a9265fb7092efd67243d7b6dd6e2548a
diff --git a/trunk/include/trace/syscall.h b/trunk/include/trace/syscall.h
index 31966a4fb8cc..0c95796177d7 100644
--- a/trunk/include/trace/syscall.h
+++ b/trunk/include/trace/syscall.h
@@ -39,8 +39,6 @@ extern int reg_event_syscall_enter(struct ftrace_event_call *call);
 extern void unreg_event_syscall_enter(struct ftrace_event_call *call);
 extern int reg_event_syscall_exit(struct ftrace_event_call *call);
 extern void unreg_event_syscall_exit(struct ftrace_event_call *call);
-extern int
-ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s);
 enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags,
 				      struct trace_event *event);
 enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags,
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index 0ebeb1d76ddf..23a384b92512 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -1821,7 +1821,7 @@ rb_add_time_stamp(struct ring_buffer_event *event, u64 delta)
 }
 
 /**
- * ring_buffer_update_event - update event type and data
+ * rb_update_event - update event type and data
  * @event: the even to update
  * @type: the type of event
  * @length: the size of the event field in the ring buffer
@@ -2723,8 +2723,8 @@ EXPORT_SYMBOL_GPL(ring_buffer_discard_commit);
  * and not the length of the event which would hold the header.
  */
 int ring_buffer_write(struct ring_buffer *buffer,
-			unsigned long length,
-			void *data)
+		      unsigned long length,
+		      void *data)
 {
 	struct ring_buffer_per_cpu *cpu_buffer;
 	struct ring_buffer_event *event;