Merge branch 'bcache-for-upstream' of git://evilpiepirate.org/~kent/linux-bcache...

[~andy/linux] / arch / arm / kernel / return_address.c

diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
index 8085417555dd7c49176cd06d88354dd1b2faca67..fafedd86885ddeb22c232a373239dd17ba620d3a 100644 (file)
--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
@@ -26,7 +26,7 @@ static int save_return_addr(struct stackframe *frame, void *d)
        struct return_address_data *data = d;
 
        if (!data->level) {
-               data->addr = (void *)frame->lr;
+               data->addr = (void *)frame->pc;
 
                return 1;
        } else {
@@ -41,7 +41,8 @@ void *return_address(unsigned int level)
        struct stackframe frame;
        register unsigned long current_sp asm ("sp");
 
-       data.level = level + 1;
+       data.level = level + 2;
+       data.addr = NULL;
 
        frame.fp = (unsigned long)__builtin_frame_address(0);
        frame.sp = current_sp;