---

yaml --- r: 121190 b: refs/heads/master c: 8d26487 h: refs/heads/master v: v3
git-mirror · Nov 23, 2008 · fa6a8bf · fa6a8bf
1 parent 591a18d
commit fa6a8bf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cffa10aecb6891f090a4d53a075bc40c082c45fc
+refs/heads/master: 8d26487fd4ddda7a0237da418fb8669fb06ae557
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -36,6 +36,7 @@ config X86
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_GENERIC_DMA_COHERENT if X86_32
 	select HAVE_EFFICIENT_UNALIGNED_ACCESS
+	select USER_STACKTRACE_SUPPORT
 
 config ARCH_DEFCONFIG
 	string

diff --git a/trunk/include/linux/stacktrace.h b/trunk/include/linux/stacktrace.h
@@ -16,7 +16,7 @@ extern void save_stack_trace_tsk(struct task_struct *tsk,
 
 extern void print_stack_trace(struct stack_trace *trace, int spaces);
 
-#ifdef CONFIG_X86
+#ifdef CONFIG_USER_STACKTRACE_SUPPORT
 extern void save_stack_trace_user(struct stack_trace *trace);
 #else
 # define save_stack_trace_user(trace)              do { } while (0)

diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
@@ -3,6 +3,9 @@
 #  select HAVE_FUNCTION_TRACER:
 #
 
+config USER_STACKTRACE_SUPPORT
+	bool
+
 config NOP_TRACER
 	bool
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,9 @@ @@
     #  select HAVE_FUNCTION_TRACER:
     #
+    config USER_STACKTRACE_SUPPORT
+    	bool
     config NOP_TRACER
     	bool
@@ Expand Down @@