upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

The cpu_id macro was renamed in r278529, catch up with this new name.

Browse source
This commit is contained in:
Andrew Turner 2015-02-11 10:37:55 +00:00
parent b48e3e7365
commit 90e8f62386
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/arm/xscale/ixp425/if_npe.c
View file

@ -285,7 +285,7 @@ unit2npeid(int unit)
};
/* XXX check feature register instead */
return (unit < 3 ? npeidmap[
(cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1);
(cpu_ident() & CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1);
}
static int

2
sys/dev/hwpmc/hwpmc_armv7.c
View file

@ -555,7 +555,7 @@ armv7_pcpu_init(struct pmc_mdep *md, int cpu)
armv7_pcpu[cpu] = pac = malloc(sizeof(struct armv7_cpu), M_PMC,
M_WAITOK|M_ZERO);
cpuid = cpu_id();
cpuid = cpu_ident();
pac->cortex_ver = (cpuid >> CPU_ID_CORTEX_VER_SHIFT) & \
CPU_ID_CORTEX_VER_MASK;