1 files changed, 10 insertions, 22 deletions

diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index fa84e9744330..6f2c6d914cbc 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -710,20 +710,14 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
 }
 
 #ifdef CONFIG_X86
-static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-                                        u64 *value)
+static int acpi_throttling_rdmsr(u64 *value)
 {
-        struct cpuinfo_x86 *c;
         u64 msr_high, msr_low;
-        unsigned int cpu;
         u64 msr = 0;
         int ret = -1;
 
-        cpu = pr->id;
-        c = &cpu_data(cpu);
-
-        if ((c->x86_vendor != X86_VENDOR_INTEL) ||
-                !cpu_has(c, X86_FEATURE_ACPI)) {
+        if ((this_cpu_read(cpu_info.x86_vendor) != X86_VENDOR_INTEL) ||
+                !this_cpu_has(X86_FEATURE_ACPI)) {
                 printk(KERN_ERR PREFIX
                         "HARDWARE addr space,NOT supported yet\n");
         } else {
@@ -738,18 +732,13 @@ static int acpi_throttling_rdmsr(struct acpi_processor *pr,
         return ret;
 }
 
-static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
+static int acpi_throttling_wrmsr(u64 value)
 {
-        struct cpuinfo_x86 *c;
-        unsigned int cpu;
         int ret = -1;
         u64 msr;
 
-        cpu = pr->id;
-        c = &cpu_data(cpu);
-
-        if ((c->x86_vendor != X86_VENDOR_INTEL) ||
-                !cpu_has(c, X86_FEATURE_ACPI)) {
+        if ((this_cpu_read(cpu_info.x86_vendor) != X86_VENDOR_INTEL) ||
+                !this_cpu_has(X86_FEATURE_ACPI)) {
                 printk(KERN_ERR PREFIX
                         "HARDWARE addr space,NOT supported yet\n");
         } else {
@@ -761,15 +750,14 @@ static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
         return ret;
 }
 #else
-static int acpi_throttling_rdmsr(struct acpi_processor *pr,
-                                u64 *value)
+static int acpi_throttling_rdmsr(u64 *value)
 {
         printk(KERN_ERR PREFIX
                 "HARDWARE addr space,NOT supported yet\n");
         return -1;
 }
 
-static int acpi_throttling_wrmsr(struct acpi_processor *pr, u64 value)
+static int acpi_throttling_wrmsr(u64 value)
 {
         printk(KERN_ERR PREFIX
                 "HARDWARE addr space,NOT supported yet\n");
@@ -801,7 +789,7 @@ static int acpi_read_throttling_status(struct acpi_processor *pr,
                 ret = 0;
                 break;
         case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                ret = acpi_throttling_rdmsr(pr, value);
+                ret = acpi_throttling_rdmsr(value);
                 break;
         default:
                 printk(KERN_ERR PREFIX "Unknown addr space %d\n",
@@ -834,7 +822,7 @@ static int acpi_write_throttling_state(struct acpi_processor *pr,
                 ret = 0;
                 break;
         case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                ret = acpi_throttling_wrmsr(pr, value);
+                ret = acpi_throttling_wrmsr(value);
                 break;
         default:
                 printk(KERN_ERR PREFIX "Unknown addr space %d\n",