mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
xtensa: fix return_address
return_address returns the address that is one level higher in the call stack than requested in its argument, because level 0 corresponds to its caller's return address. Use requested level as the number of stack frames to skip. This fixes the address reported by might_sleep and friends. Cc: stable@vger.kernel.org Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
parent
2663147dc7
commit
ada770b1e7
1 changed files with 5 additions and 1 deletions
|
@ -253,10 +253,14 @@ static int return_address_cb(struct stackframe *frame, void *data)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* level == 0 is for the return address from the caller of this function,
|
||||||
|
* not from this function itself.
|
||||||
|
*/
|
||||||
unsigned long return_address(unsigned level)
|
unsigned long return_address(unsigned level)
|
||||||
{
|
{
|
||||||
struct return_addr_data r = {
|
struct return_addr_data r = {
|
||||||
.skip = level + 1,
|
.skip = level,
|
||||||
};
|
};
|
||||||
walk_stackframe(stack_pointer(NULL), return_address_cb, &r);
|
walk_stackframe(stack_pointer(NULL), return_address_cb, &r);
|
||||||
return r.addr;
|
return r.addr;
|
||||||
|
|
Loading…
Reference in a new issue