tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Ingo Molnar 66a05d6b c36910c1

+6 -3
unified split
+2 -3
arch/x86/oprofile/nmi_int.c
··· 401 *cpu_type = "i386/pii"; 402 break; 403 case 6 ... 8: 404 *cpu_type = "i386/piii"; 405 break; 406 case 9: 407 *cpu_type = "i386/p6_mobile"; 408 - break; 409 - case 10 ... 13: 410 - *cpu_type = "i386/p6"; 411 break; 412 case 14: 413 *cpu_type = "i386/core";
··· 401 *cpu_type = "i386/pii"; 402 break; 403 case 6 ... 8: 404 + case 10 ... 11: 405 *cpu_type = "i386/piii"; 406 break; 407 case 9: 408 + case 13: 409 *cpu_type = "i386/p6_mobile"; 410 break; 411 case 14: 412 *cpu_type = "i386/core";
+4
arch/x86/oprofile/op_model_ppro.c
··· 156 unsigned int low, high; 157 int i; 158 159 for (i = 0; i < num_counters; ++i) { 160 if (reset_value[i]) { 161 CTRL_READ(low, high, msrs, i); ··· 173 unsigned int low, high; 174 int i; 175 176 for (i = 0; i < num_counters; ++i) { 177 if (!reset_value[i]) 178 continue;
··· 156 unsigned int low, high; 157 int i; 158 159 + if (!reset_value) 160 + return; 161 for (i = 0; i < num_counters; ++i) { 162 if (reset_value[i]) { 163 CTRL_READ(low, high, msrs, i); ··· 171 unsigned int low, high; 172 int i; 173 174 + if (!reset_value) 175 + return; 176 for (i = 0; i < num_counters; ++i) { 177 if (!reset_value[i]) 178 continue;