Date: Wed, 11 Feb 2015 10:37:56 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278577 - in head/sys: arm/xscale/ixp425 dev/hwpmc Message-ID: <201502111037.t1BAbuCk008694@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Wed Feb 11 10:37:55 2015 New Revision: 278577 URL: https://svnweb.freebsd.org/changeset/base/278577 Log: The cpu_id macro was renamed in r278529, catch up with this new name. Modified: head/sys/arm/xscale/ixp425/if_npe.c head/sys/dev/hwpmc/hwpmc_armv7.c Modified: head/sys/arm/xscale/ixp425/if_npe.c ============================================================================== --- head/sys/arm/xscale/ixp425/if_npe.c Wed Feb 11 09:21:36 2015 (r278576) +++ head/sys/arm/xscale/ixp425/if_npe.c Wed Feb 11 10:37:55 2015 (r278577) @@ -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 Modified: head/sys/dev/hwpmc/hwpmc_armv7.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_armv7.c Wed Feb 11 09:21:36 2015 (r278576) +++ head/sys/dev/hwpmc/hwpmc_armv7.c Wed Feb 11 10:37:55 2015 (r278577) @@ -555,7 +555,7 @@ armv7_pcpu_init(struct pmc_mdep *md, int 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502111037.t1BAbuCk008694>