diff options
| author | Borislav Petkov | 2012-04-27 12:53:59 +0200 |
|---|---|---|
| committer | Borislav Petkov | 2012-06-07 12:43:46 +0200 |
| commit | 2c9c42fa98c283961b7f6b6542fb4bf0c0539e15 (patch) | |
| tree | 59130b1547fefd1ede9e41671d5f14e9a76527a8 /arch/x86/kernel/cpu/mcheck | |
| parent | x86, MCE, AMD: Print decimal thresholding values (diff) | |
| download | kernel-qcow2-linux-2c9c42fa98c283961b7f6b6542fb4bf0c0539e15.tar.gz kernel-qcow2-linux-2c9c42fa98c283961b7f6b6542fb4bf0c0539e15.tar.xz kernel-qcow2-linux-2c9c42fa98c283961b7f6b6542fb4bf0c0539e15.zip | |
x86, MCE, AMD: Cleanup reading of error_count
We have rdmsr_on_cpu() now so remove locally defined solution in favor
of the generic one.
No functionality change.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_amd.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 0b1bb0e15881..a7204ef37223 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -359,27 +359,14 @@ store_threshold_limit(struct threshold_block *b, const char *buf, size_t size) return size; } -struct threshold_block_cross_cpu { - struct threshold_block *tb; - long retval; -}; - -static void local_error_count_handler(void *_tbcc) -{ - struct threshold_block_cross_cpu *tbcc = _tbcc; - struct threshold_block *b = tbcc->tb; - u32 low, high; - - rdmsr(b->address, low, high); - tbcc->retval = (high & 0xFFF) - (THRESHOLD_MAX - b->threshold_limit); -} - static ssize_t show_error_count(struct threshold_block *b, char *buf) { - struct threshold_block_cross_cpu tbcc = { .tb = b, }; + u32 lo, hi; + + rdmsr_on_cpu(b->cpu, b->address, &lo, &hi); - smp_call_function_single(b->cpu, local_error_count_handler, &tbcc, 1); - return sprintf(buf, "%lu\n", tbcc.retval); + return sprintf(buf, "%u\n", ((hi & THRESHOLD_MAX) - + (THRESHOLD_MAX - b->threshold_limit))); } static ssize_t store_error_count(struct threshold_block *b, |