Module Name: src
Committed By: christos
Date: Sat Jan 23 21:39:18 UTC 2016
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
src/sys/arch/arm/arm32: cpu.c
src/sys/arch/arm/include: cpufunc.h
src/sys/arch/arm/include/arm32: psl.h
Log Message:
Rename the cpu_id() define to cpu_idnum() so that it does not conflict with
dtrace and friends.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/arm/arm/cpufunc.c
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/arm/include/cpufunc.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/include/arm32/psl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.159 src/sys/arch/arm/arm/cpufunc.c:1.160
--- src/sys/arch/arm/arm/cpufunc.c:1.159 Thu Dec 10 17:04:54 2015
+++ src/sys/arch/arm/arm/cpufunc.c Sat Jan 23 16:39:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.159 2015/12/10 22:04:54 skrll Exp $ */
+/* $NetBSD: cpufunc.c,v 1.160 2016/01/23 21:39:17 christos Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.159 2015/12/10 22:04:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.160 2016/01/23 21:39:17 christos Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -1573,7 +1573,7 @@ get_cachetype_cp15(void)
* reserved ID register is encountered, the System Control
* processor returns the value of the main ID register.
*/
- if (ctype == cpu_id())
+ if (ctype == cpu_idnum())
goto out;
#if (ARM_MMU_V6 + ARM_MMU_V7) > 0
@@ -1587,7 +1587,7 @@ get_cachetype_cp15(void)
arm_cache_prefer_mask = PAGE_SIZE;
}
#ifdef CPU_CORTEX
- if (CPU_ID_CORTEX_P(cpu_id())) {
+ if (CPU_ID_CORTEX_P(cpu_idnum())) {
arm_pcache.dcache_type = CACHE_TYPE_PIPT;
} else
#endif
@@ -1730,7 +1730,7 @@ static void
get_cachetype_table(void)
{
int i;
- uint32_t cpuid = cpu_id();
+ uint32_t cpuid = cpu_idnum();
for (i = 0; cachetab[i].ct_cpuid != 0; i++) {
if (cachetab[i].ct_cpuid == (cpuid & CPU_ID_CPU_MASK)) {
@@ -3184,7 +3184,7 @@ arm11x6_setup(char *args)
uint32_t sbz=0;
uint32_t cpuid;
- cpuid = cpu_id();
+ cpuid = cpu_idnum();
cpuctrl =
CPU_CONTROL_MMU_ENABLE |
Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.111 src/sys/arch/arm/arm32/cpu.c:1.112
--- src/sys/arch/arm/arm32/cpu.c:1.111 Thu Nov 12 05:49:35 2015
+++ src/sys/arch/arm/arm32/cpu.c Sat Jan 23 16:39:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.111 2015/11/12 10:49:35 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.112 2016/01/23 21:39:17 christos Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.111 2015/11/12 10:49:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.112 2016/01/23 21:39:17 christos Exp $");
#include <sys/systm.h>
#include <sys/conf.h>
@@ -89,7 +89,7 @@ cpu_attach(device_t dv, cpuid_t id)
/* Get the CPU ID from coprocessor 15 */
- ci->ci_arm_cpuid = cpu_id();
+ ci->ci_arm_cpuid = cpu_idnum();
ci->ci_arm_cputype = ci->ci_arm_cpuid & CPU_ID_CPU_MASK;
ci->ci_arm_cpurev = ci->ci_arm_cpuid & CPU_ID_REVISION_MASK;
} else {
Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.75 src/sys/arch/arm/include/cpufunc.h:1.76
--- src/sys/arch/arm/include/cpufunc.h:1.75 Sat Oct 17 12:34:43 2015
+++ src/sys/arch/arm/include/cpufunc.h Sat Jan 23 16:39:18 2016
@@ -169,7 +169,7 @@ struct cpu_functions {
extern struct cpu_functions cpufuncs;
extern u_int cputype;
-#define cpu_id() cpufuncs.cf_id()
+#define cpu_idnum() cpufuncs.cf_id()
#define cpu_control(c, e) cpufuncs.cf_control(c, e)
#define cpu_domains(d) cpufuncs.cf_domains(d)
Index: src/sys/arch/arm/include/arm32/psl.h
diff -u src/sys/arch/arm/include/arm32/psl.h:1.20 src/sys/arch/arm/include/arm32/psl.h:1.21
--- src/sys/arch/arm/include/arm32/psl.h:1.20 Tue Feb 4 13:51:16 2014
+++ src/sys/arch/arm/include/arm32/psl.h Sat Jan 23 16:39:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.20 2014/02/04 18:51:16 matt Exp $ */
+/* $NetBSD: psl.h,v 1.21 2016/01/23 21:39:18 christos Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -66,6 +66,8 @@
#ifdef _KERNEL
#ifndef _LOCORE
+#include <sys/types.h>
+
int raisespl (int);
int lowerspl (int);
void splx (int);
