git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
return_address.c
diff --git
a/arch/arm/kernel/return_address.c
b/arch/arm/kernel/return_address.c
index
8085417
..
f6aa84d
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) {
struct return_address_data *data = d;
if (!data->level) {
- data->addr = (void *)frame->
lr
;
+ data->addr = (void *)frame->
pc
;
return 1;
} else {
return 1;
} else {
@@
-41,7
+41,8
@@
void *return_address(unsigned int level)
struct stackframe frame;
register unsigned long current_sp asm ("sp");
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;
frame.fp = (unsigned long)__builtin_frame_address(0);
frame.sp = current_sp;
@@
-62,11
+63,6
@@
void *return_address(unsigned int level)
#warning "TODO: return_address should use unwind tables"
#endif
#warning "TODO: return_address should use unwind tables"
#endif
-void *return_address(unsigned int level)
-{
- return NULL;
-}
-
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
EXPORT_SYMBOL_GPL(return_address);
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
EXPORT_SYMBOL_GPL(return_address);