Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66a05d6b authored Dec 03, 2008 by Ingo Molnar

Merge branch 'oprofile-for-tip' of...

Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent

parents c36910c1 3d337c65

arch/x86/oprofile/nmi_int.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -401,14 +401,13 @@ static int __init ppro_init(char **cpu_type)
		*cpu_type = "i386/pii";
		break;
		case 6 ... 8:
		case 10 ... 11:
		*cpu_type = "i386/piii";
		break;
		case 9:
		case 13:
		*cpu_type = "i386/p6_mobile";
		break;
		case 10 ... 13:
		*cpu_type = "i386/p6";
		break;
		case 14:
		*cpu_type = "i386/core";
		break;

arch/x86/oprofile/op_model_ppro.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,8 @@ static void ppro_start(struct op_msrs const * const msrs)
		unsigned int low, high;
		int i;

		if (!reset_value)
		return;
		for (i = 0; i < num_counters; ++i) {
		if (reset_value[i]) {
		CTRL_READ(low, high, msrs, i);
		@@ -171,6 +173,8 @@ static void ppro_stop(struct op_msrs const * const msrs)
		unsigned int low, high;
		int i;

		if (!reset_value)
		return;
		for (i = 0; i < num_counters; ++i) {
		if (!reset_value[i])
		continue;