summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2014-12-10 22:57:25 +0100
committerRichard Braun <rbraun@sceen.net>2014-12-10 23:16:47 +0100
commita75f2a0436c80f1c28a8698b69dba69147f00d8c (patch)
tree5deffa17b78ce95edc6508b90af27fde0d06cd31
parent67f2f3decba52e0f8c5705f85eacf0f821bce909 (diff)
x86/strace: replace call to pmap_extract
-rw-r--r--arch/x86/machine/strace.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/machine/strace.c b/arch/x86/machine/strace.c
index a3a8f1f2..6058c561 100644
--- a/arch/x86/machine/strace.c
+++ b/arch/x86/machine/strace.c
@@ -82,6 +82,7 @@ strace_show(unsigned long ip, unsigned long bp)
phys_addr_t pa;
void **frame;
unsigned int i;
+ int error;
printk("strace: stack trace:\n");
strace_show_one(0, ip);
@@ -93,17 +94,17 @@ strace_show(unsigned long ip, unsigned long bp)
if (frame == NULL)
break;
- pa = pmap_extract(kernel_pmap, (unsigned long)&frame[1]);
+ error = pmap_kextract((unsigned long)&frame[1], &pa);
- if (pa == 0) {
+ if (error) {
printk("strace: unmapped return address at %p\n", &frame[1]);
break;
}
strace_show_one(i, (unsigned long)frame[1]);
- pa = pmap_extract(kernel_pmap, (unsigned long)frame);
+ error = pmap_kextract((unsigned long)frame, &pa);
- if (pa == 0) {
+ if (error) {
printk("strace: unmapped frame address at %p\n", frame);
break;
}