Skip to content

Commit ed95791

Browse files
authored
fix conflicting variables
1 parent 3c3d1c4 commit ed95791

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

driver/others/dynamic_arm64.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,10 @@ static gotoblas_t *get_coretype(void) {
273273
#ifdef __linux
274274
int i;
275275
int ncores=0;
276-
int p,cpucap,cpulowperf=0,cpumidperf=0,cpuhiperf=0;
276+
int prt,cpucap,cpulowperf=0,cpumidperf=0,cpuhiperf=0;
277277
FILE *infile;
278-
char buffer[512], *p, *cpu_part = NULL, *cpu_implementer = NULL;
279-
p = (char *) NULL ;
278+
char buffer[512], *cpu_part = NULL, *cpu_implementer = NULL;
279+
280280
infile = fopen("/sys/devices/system/cpu/possible","r");
281281
if (infile) {
282282
(void)fgets(buffer, sizeof(buffer), infile);
@@ -297,7 +297,7 @@ static gotoblas_t *get_coretype(void) {
297297
(void)fgets(buffer, sizeof(buffer), infile);
298298
midr_el1=strtoul(buffer,NULL,16);
299299
implementer = (midr_el1 >> 24) & 0xFF;
300-
p = (midr_el1 >> 4) & 0xFFF;
300+
prt = (midr_el1 >> 4) & 0xFFF;
301301
fclose(infile);
302302
sprintf(buffer,"/sys/devices/system/cpu/cpu%d/cpu_capability",i);
303303
infile = fopen(buffer,"r");
@@ -308,22 +308,22 @@ static gotoblas_t *get_coretype(void) {
308308
if (cpucap >= 1000) cpuhiperf++;
309309
else if (cpucap >=500) cpumidperf++;
310310
else cpulowperf++;
311-
if (cpucap >=1000) part = p;
311+
if (cpucap >=1000) part = prt;
312312
} else if (implementer == 0x41 ){
313-
if (p >= 0xd4b) cpuhiperf++:
314-
else if (p>= 0xd07) cpumidperf++;
313+
if (prt >= 0xd4b) cpuhiperf++:
314+
else if (prt>= 0xd07) cpumidperf++;
315315
else cpulowperf++;
316316
} else cpulowperf++;
317317
}
318-
if (!part) part = p;
318+
if (!part) part = prt;
319319
#else
320320
snprintf(coremsg, 128, "Kernel lacks cpuid feature support. Auto detection of core type failed !!!\n");
321321
openblas_warning(1, coremsg);
322322
return NULL;
323323
#endif
324324
} else {
325325
get_cpu_ftr(MIDR_EL1, midr_el1);
326-
}
326+
327327
/*
328328
* MIDR_EL1
329329
*
@@ -334,7 +334,7 @@ static gotoblas_t *get_coretype(void) {
334334
*/
335335
implementer = (midr_el1 >> 24) & 0xFF;
336336
part = (midr_el1 >> 4) & 0xFFF;
337-
337+
}
338338
switch(implementer)
339339
{
340340
case 0x41: // ARM

0 commit comments

Comments
 (0)