Merge pull request #424 from ihnorton/fix_arm_cpuid

xianyi · xianyi · commit 27af6e35d392 · 2014-07-31T13:54:07.000+08:00
cpuid_arm: fix detection when cpuinfo uses "Processor"
diff --git a/cpuid_arm.c b/cpuid_arm.c
@@ -90,7 +90,7 @@ int detect(void)
 	while (fgets(buffer, sizeof(buffer), infile))
 	{
 
-		if (!strncmp("model name", buffer, 10))
+		if ((!strncmp("model name", buffer, 10)) || (!strncmp("Processor", buffer, 9)))
 		{
 			p = strchr(buffer, ':') + 2;
 			break;

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ int detect(void)`
`90`	`90`	`while (fgets(buffer, sizeof(buffer), infile))`
`91`	`91`	`{`
`92`	`92`
`93`		`- if (!strncmp("model name", buffer, 10))`
	`93`	`+ if ((!strncmp("model name", buffer, 10)) \|\| (!strncmp("Processor", buffer, 9)))`
`94`	`94`	`{`
`95`	`95`	`p = strchr(buffer, ':') + 2;`
`96`	`96`	`break;`