diff options
| author |   Marc Zyngier <maz@kernel.org> | 2020-11-12 21:20:43 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-12 21:20:43 +0000 |
| commit | 4f6b838c378a52ea3ae0b15f12ca8a20849072fa (patch) | |
| tree | fbd8c2346320f97eda221b9150d787f9006e8b35 /kernel/stacktrace.c | |
| parent | KVM: arm64: Remove AA64ZFR0_EL1 accessors (diff) | |
| parent | Linux 5.10-rc1 (diff) | |
Merge tag 'v5.10-rc1' into kvmarm-master/next
Linux 5.10-rc1
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'kernel/stacktrace.c')
| -rw-r--r-- | kernel/stacktrace.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c index 946f44a9e86a..9f8117c7cfdd 100644 --- a/kernel/stacktrace.c +++ b/kernel/stacktrace.c @@ -78,8 +78,7 @@ struct stacktrace_cookie { unsigned int len; }; -static bool stack_trace_consume_entry(void *cookie, unsigned long addr, - bool reliable) +static bool stack_trace_consume_entry(void *cookie, unsigned long addr) { struct stacktrace_cookie *c = cookie; @@ -94,12 +93,11 @@ static bool stack_trace_consume_entry(void *cookie, unsigned long addr, return c->len < c->size; } -static bool stack_trace_consume_entry_nosched(void *cookie, unsigned long addr, - bool reliable) +static bool stack_trace_consume_entry_nosched(void *cookie, unsigned long addr) { if (in_sched_functions(addr)) return true; - return stack_trace_consume_entry(cookie, addr, reliable); + return stack_trace_consume_entry(cookie, addr); } /** |