Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
This commit is contained in:
commit
0d2b54904d
1 changed files with 3 additions and 1 deletions
|
@ -671,7 +671,9 @@ static int __init ppro_init(char **cpu_type)
|
|||
case 14:
|
||||
*cpu_type = "i386/core";
|
||||
break;
|
||||
case 15: case 23:
|
||||
case 0x0f:
|
||||
case 0x16:
|
||||
case 0x17:
|
||||
*cpu_type = "i386/core_2";
|
||||
break;
|
||||
case 0x1a:
|
||||
|
|
Reference in a new issue