Skip to content

L
linux-davinci
Commit 8689b517 authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files
Options

[PATCH] i386: Fix some warnings added by earlier patch 

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 90767bd1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
arch/i386/kernel/nmi.c
View file @ 8689b517
...@@ -126,7 +126,7 @@ int avail_to_resrv_perfctr_nmi_bit(unsigned int counter) ...@@ -126,7 +126,7 @@ int avail_to_resrv_perfctr_nmi_bit(unsigned int counter)
int cpu; int cpu;
BUG_ON(counter > NMI_MAX_COUNTER_BITS); BUG_ON(counter > NMI_MAX_COUNTER_BITS);
for_each_possible_cpu (cpu) { for_each_possible_cpu (cpu) {
if (test_bit(counter, &per_cpu(perfctr_nmi_owner, cpu))) if (test_bit(counter, &per_cpu(perfctr_nmi_owner, cpu)[0]))
return 0; return 0;
} }
return 1; return 1;
...@@ -142,7 +142,7 @@ int avail_to_resrv_perfctr_nmi(unsigned int msr) ...@@ -142,7 +142,7 @@ int avail_to_resrv_perfctr_nmi(unsigned int msr)
BUG_ON(counter > NMI_MAX_COUNTER_BITS); BUG_ON(counter > NMI_MAX_COUNTER_BITS);
for_each_possible_cpu (cpu) { for_each_possible_cpu (cpu) {
if (test_bit(counter, &per_cpu(perfctr_nmi_owner, cpu))) if (test_bit(counter, &per_cpu(perfctr_nmi_owner, cpu)[0]))
return 0; return 0;
} }
return 1; return 1;
...@@ -157,7 +157,7 @@ static int __reserve_perfctr_nmi(int cpu, unsigned int msr) ...@@ -157,7 +157,7 @@ static int __reserve_perfctr_nmi(int cpu, unsigned int msr)
counter = nmi_perfctr_msr_to_bit(msr); counter = nmi_perfctr_msr_to_bit(msr);
BUG_ON(counter > NMI_MAX_COUNTER_BITS); BUG_ON(counter > NMI_MAX_COUNTER_BITS);
if (!test_and_set_bit(counter, &per_cpu(perfctr_nmi_owner, cpu))) if (!test_and_set_bit(counter, &per_cpu(perfctr_nmi_owner, cpu)[0]))
return 1; return 1;
return 0; return 0;
} }
...@@ -171,7 +171,7 @@ static void __release_perfctr_nmi(int cpu, unsigned int msr) ...@@ -171,7 +171,7 @@ static void __release_perfctr_nmi(int cpu, unsigned int msr)
counter = nmi_perfctr_msr_to_bit(msr); counter = nmi_perfctr_msr_to_bit(msr);
BUG_ON(counter > NMI_MAX_COUNTER_BITS); BUG_ON(counter > NMI_MAX_COUNTER_BITS);
clear_bit(counter, &per_cpu(perfctr_nmi_owner, cpu)); clear_bit(counter, &per_cpu(perfctr_nmi_owner, cpu)[0]);
} }
int reserve_perfctr_nmi(unsigned int msr) int reserve_perfctr_nmi(unsigned int msr)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment