diff --git a/[refs] b/[refs]
index a8e2f3aaa9ca..1b470443d3fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 604094f4615180f71da799e7e5b191f5c2a42a28
+refs/heads/master: f08340c5d68ab621f377c108637e2d8e95b3e5d4
diff --git a/trunk/Documentation/tracepoints.txt b/trunk/Documentation/tracepoints.txt
index 2d42241a25c3..6f0a044f5b5e 100644
--- a/trunk/Documentation/tracepoints.txt
+++ b/trunk/Documentation/tracepoints.txt
@@ -45,7 +45,7 @@ In include/trace/subsys.h :
 #include <linux/tracepoint.h>
 
 DECLARE_TRACE(subsys_eventname,
-	TPPTOTO(int firstarg, struct task_struct *p),
+	TPPROTO(int firstarg, struct task_struct *p),
 	TPARGS(firstarg, p));
 
 In subsys/file.c (where the tracing statement must be added) :
@@ -66,7 +66,7 @@ Where :
     - subsys is the name of your subsystem.
     - eventname is the name of the event to trace.
 
-- TPPTOTO(int firstarg, struct task_struct *p) is the prototype of the
+- TPPROTO(int firstarg, struct task_struct *p) is the prototype of the
   function called by this tracepoint.
 
 - TPARGS(firstarg, p) are the parameters names, same as found in the
diff --git a/trunk/fs/seq_file.c b/trunk/fs/seq_file.c
index 16c211558c22..f03220d7891b 100644
--- a/trunk/fs/seq_file.c
+++ b/trunk/fs/seq_file.c
@@ -387,7 +387,7 @@ char *mangle_path(char *s, char *p, char *esc)
 	}
 	return NULL;
 }
-EXPORT_SYMBOL(mangle_path);
+EXPORT_SYMBOL_GPL(mangle_path);
 
 /*
  * return the absolute path of 'dentry' residing in mount 'mnt'.
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 91887a280ab9..5811e0a5f732 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -983,7 +983,6 @@ static void ftrace_trace_userstack(struct trace_array *tr,
 		   struct trace_array_cpu *data,
 		   unsigned long flags, int pc)
 {
-#ifdef CONFIG_STACKTRACE
 	struct ring_buffer_event *event;
 	struct userstack_entry *entry;
 	struct stack_trace trace;
@@ -1009,7 +1008,6 @@ static void ftrace_trace_userstack(struct trace_array *tr,
 
 	save_stack_trace_user(&trace);
 	ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
-#endif
 }
 
 void __trace_userstack(struct trace_array *tr,