diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-28 08:34:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-28 08:34:10 +0100 |
| commit | 0edbf9e55295585bbe9df61b646ca5bf80a8e1eb (patch) | |
| tree | d9b6869ff7a245343a9b030511d4bfd18b00f192 /arch/x86/kernel/dumpstack.c | |
| parent | usb: ohci-da8xx: rename driver to ohci-da8xx (diff) | |
| parent | Linux 4.9-rc7 (diff) | |
| download | wireguard-linux-0edbf9e55295585bbe9df61b646ca5bf80a8e1eb.tar.xz wireguard-linux-0edbf9e55295585bbe9df61b646ca5bf80a8e1eb.zip | |
Merge 4.9-rc7 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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); |