Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 366228
b: refs/heads/master
c: 682469a
h: refs/heads/master
v: v3
  • Loading branch information
Borislav Petkov committed Apr 16, 2013
1 parent dd4e359 commit eedfe51
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 55a36b65ee7107d6bb557c96fd202c4e90164542
refs/heads/master: 682469a5db6fade318a72406935b5000186e5643
8 changes: 4 additions & 4 deletions trunk/arch/x86/kernel/cpu/amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)
{
struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());
u32 gprs[8] = { 0 };
int err;

WARN_ONCE((c->x86 != 0xf), "%s should only be used on K8!\n", __func__);
WARN_ONCE((boot_cpu_data.x86 != 0xf),
"%s should only be used on K8!\n", __func__);

gprs[1] = msr;
gprs[7] = 0x9c5a203a;
Expand All @@ -38,10 +38,10 @@ static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)

static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)
{
struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());
u32 gprs[8] = { 0 };

WARN_ONCE((c->x86 != 0xf), "%s should only be used on K8!\n", __func__);
WARN_ONCE((boot_cpu_data.x86 != 0xf),
"%s should only be used on K8!\n", __func__);

gprs[0] = (u32)val;
gprs[1] = msr;
Expand Down

0 comments on commit eedfe51

Please sign in to comment.