diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-02 11:13:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-02 11:13:44 +0100 |
| commit | 1b95b1a06cb27badb3e53329fb56af2a2113fd80 (patch) | |
| tree | bbe52b10fde003833c980b0a30dd23b0e0855c87 /arch/x86/kernel/dumpstack.c | |
| parent | 3cded41794818d788aa1dc028ede4a1c1222d937 (diff) | |
| parent | 1be5d4fa0af34fb7bafa205aeb59f5c7cc7a089d (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/dumpstack.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 9b7cf5c28f5f..85f854b98a9d 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -112,7 +112,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, for (; stack < stack_info.end; stack++) { unsigned long real_addr; int reliable = 0; - unsigned long addr = *stack; + unsigned long addr = READ_ONCE_NOCHECK(*stack); unsigned long *ret_addr_p = unwind_get_return_address_ptr(&state); |