netns xfrm: fix "ip xfrm state|policy count" misreport

[safe/jmp/linux-2.6] / kernel / stacktrace.c

diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c
index 0914d0c..eb212f8 100644 (file)
--- a/kernel/stacktrace.c
+++ b/kernel/stacktrace.c
@@ -6,22 +6,32 @@
  *  Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
  */
 #include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/kallsyms.h>
 #include <linux/stacktrace.h>
 
 void print_stack_trace(struct stack_trace *trace, int spaces)
 {
-       int i, j;
+       int i;
 
        if (WARN_ON(!trace->entries))
                return;
 
        for (i = 0; i < trace->nr_entries; i++) {
-               unsigned long ip = trace->entries[i];
-
-               for (j = 0; j < spaces + 1; j++)
-                       printk(" ");
-               print_ip_sym(ip);
+               printk("%*c", 1 + spaces, ' ');
+               print_ip_sym(trace->entries[i]);
        }
 }
+EXPORT_SYMBOL_GPL(print_stack_trace);
 
+/*
+ * Architectures that do not implement save_stack_trace_tsk get this
+ * weak alias and a once-per-bootup warning (whenever this facility
+ * is utilized - for example by procfs):
+ */
+__weak void
+save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
+{
+       WARN_ONCE(1, KERN_INFO "save_stack_trace_tsk() not implemented yet.\n");
+}