Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=006e84ee3a54e393ec6bef2a9bc891dc5bde2843
Commit:     006e84ee3a54e393ec6bef2a9bc891dc5bde2843
Parent:     5558870bfbcca10cfc7b13ab866687012ea3c9af
Author:     Catalin Marinas <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 13 13:26:21 2007 +0100
Committer:  Andi Kleen <[EMAIL PROTECTED]>
CommitDate: Tue Feb 13 13:26:21 2007 +0100

    [PATCH] x86-64: do not always end the stack trace with ULONG_MAX
    
    It makes more sense to end the stack trace with ULONG_MAX only if
    nr_entries < max_entries.  Otherwise, we lose one entry in the long stack
    traces and cannot know whether the trace was complete or not.
    
    Signed-off-by: Catalin Marinas <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Jan Beulich <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
 arch/x86_64/kernel/stacktrace.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86_64/kernel/stacktrace.c b/arch/x86_64/kernel/stacktrace.c
index 6026b31..65ac2c6 100644
--- 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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to