diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 23:51:56 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 23:51:56 +0100 |
| commit | 9196a0ba9f0ebe168c7b186f63cf7cab02e55778 (patch) | |
| tree | 0d2f4b95543b23d9323dec7ffa0066706c42e654 /drivers | |
| parent | Merge tag 'edac_updates_for_6.2' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | RAS: Fix return value from show_trace() (diff) | |
| download | linux-9196a0ba9f0ebe168c7b186f63cf7cab02e55778.tar.xz linux-9196a0ba9f0ebe168c7b186f63cf7cab02e55778.zip | |
Merge tag 'ras_core_for_v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 RAS updates from Borislav Petkov:
- Fix confusing output from /sys/kernel/debug/ras/daemon_active
- Add another MCE severity error case to the Intel error severity table
to promote UC and AR errors to panic severity and remove the
corresponding code condition doing that.
- Make sure the thresholding and deferred error interrupts on AMD SMCA
systems clear the all registers reporting an error so that there are
no multiple errors logged for the same event
* tag 'ras_core_for_v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
RAS: Fix return value from show_trace()
x86/mce: Use severity table to handle uncorrected errors in kernel
x86/MCE/AMD: Clear DFR errors found in THR handler
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ras/debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ras/debugfs.c b/drivers/ras/debugfs.c index 0d4f985afbf3..f0a6391b1146 100644 --- a/drivers/ras/debugfs.c +++ b/drivers/ras/debugfs.c @@ -15,7 +15,7 @@ EXPORT_SYMBOL_GPL(ras_userspace_consumers); static int trace_show(struct seq_file *m, void *v) { - return atomic_read(&trace_count); + return 0; } static int trace_open(struct inode *inode, struct file *file) |