Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-drm-fsl-dcu.git] / arch / x86_64 / kernel / stacktrace.c

diff --git a/arch/x86_64/kernel/stacktrace.c b/arch/x86_64/kernel/stacktrace.c
index 6026b31d037ef72a9b92213f1b522b8ba8e8f0b0..65ac2c6b34a6a1f80c9be549572e1d2f2e1d102e 100644 (file)
--- a/arch/x86_64/kernel/stacktrace.c
+++ b/arch/x86_64/kernel/stacktrace.c
@@ -32,7 +32,7 @@ static void save_stack_address(void *data, unsigned long addr)
                trace->skip--;
                return;
        }
-       if (trace->nr_entries < trace->max_entries - 1)
+       if (trace->nr_entries < trace->max_entries)
                trace->entries[trace->nr_entries++] = addr;
 }
 
@@ -49,7 +49,8 @@ static struct stacktrace_ops save_stack_ops = {
 void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
 {
        dump_trace(task, NULL, NULL, &save_stack_ops, trace);
-       trace->entries[trace->nr_entries++] = ULONG_MAX;
+       if (trace->nr_entries < trace->max_entries)
+               trace->entries[trace->nr_entries++] = ULONG_MAX;
 }
 EXPORT_SYMBOL(save_stack_trace);