From 90e8f62386140544ab2c75e06bc7e65171048bdc Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Wed, 11 Feb 2015 10:37:55 +0000 Subject: [PATCH] The cpu_id macro was renamed in r278529, catch up with this new name. --- sys/arm/xscale/ixp425/if_npe.c | 2 +- sys/dev/hwpmc/hwpmc_armv7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c index d6db7e6134fd..fa3eacbeed8c 100644 --- a/sys/arm/xscale/ixp425/if_npe.c +++ b/sys/arm/xscale/ixp425/if_npe.c @@ -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 diff --git a/sys/dev/hwpmc/hwpmc_armv7.c b/sys/dev/hwpmc/hwpmc_armv7.c index d58aca5aba0c..d14a990269bc 100644 --- a/sys/dev/hwpmc/hwpmc_armv7.c +++ b/sys/dev/hwpmc/hwpmc_armv7.c @@ -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;