Commit b7a0afb0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'urgent' of... 

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent
parents da482474 e83e452b

arch/x86/oprofile/nmi_int.c

+2 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void nmi_cpu_switch(void *dummy) 


	/* move to next set */

	si += model->num_counters;

	if ((si > model->num_virt_counters) || (counter_config[si].count == 0))

	if ((si >= model->num_virt_counters) || (counter_config[si].count == 0))

		per_cpu(switch_index, cpu) = 0;

	else

		per_cpu(switch_index, cpu) = si;
@@ -598,6 +598,7 @@ static int __init ppro_init(char **cpu_type) 
	case 15: case 23:

		*cpu_type = "i386/core_2";

		break;

	case 0x2e:

	case 26:

		spec = &op_arch_perfmon_spec;

		*cpu_type = "i386/core_i7";