[PATCH] i386: Fix some warnings added by earlier patch (8689b517) · Commits · e / devices / android_kernel_fairphone_FP5

arch/i386/kernel/nmi.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ int avail_to_resrv_perfctr_nmi_bit(unsigned int counter)
		int cpu;
		BUG_ON(counter > NMI_MAX_COUNTER_BITS);
		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 1;
		@@ -142,7 +142,7 @@ int avail_to_resrv_perfctr_nmi(unsigned int msr)
		BUG_ON(counter > NMI_MAX_COUNTER_BITS);

		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 1;
		@@ -157,7 +157,7 @@ static int __reserve_perfctr_nmi(int cpu, unsigned int msr)
		counter = nmi_perfctr_msr_to_bit(msr);
		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 0;
		}
		@@ -171,7 +171,7 @@ static void __release_perfctr_nmi(int cpu, unsigned int msr)
		counter = nmi_perfctr_msr_to_bit(msr);
		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)