Skip to content

Commit

Permalink
x86, MCE, AMD: Cleanup reading of error_count
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Borislav Petkov committed Jun 7, 2012
1 parent 18c20f3 commit 2c9c42f
Showing 1 changed file with 5 additions and 18 deletions.
23 changes: 5 additions & 18 deletions arch/x86/kernel/cpu/mcheck/mce_amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 2c9c42f

Please sign in to comment.