Module Name: src
Committed By: skrll
Date: Thu Oct 25 07:13:55 UTC 2018
Modified Files:
src/sys/arch/arm/include: cpu.h
Log Message:
Align struct cpu_info member names. NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/arm/include/cpu.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/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.98 src/sys/arch/arm/include/cpu.h:1.99
--- src/sys/arch/arm/include/cpu.h:1.98 Thu Oct 18 09:01:52 2018
+++ src/sys/arch/arm/include/cpu.h Thu Oct 25 07:13:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.98 2018/10/18 09:01:52 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.99 2018/10/25 07:13:55 skrll Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -132,37 +132,49 @@ static inline void cpu_dosoftints(void);
#include <sys/evcnt.h>
struct cpu_info {
- struct cpu_data ci_data; /* MI per-cpu data */
- device_t ci_dev; /* Device corresponding to this CPU */
- cpuid_t ci_cpuid;
- uint32_t ci_arm_cpuid; /* aggregate CPU id */
- uint32_t ci_arm_cputype; /* CPU type */
- uint32_t ci_arm_cpurev; /* CPU revision */
- uint32_t ci_ctrl; /* The CPU control register */
- int ci_cpl; /* current processor level (spl) */
- volatile int ci_astpending; /* */
- int ci_want_resched; /* resched() was called */
- int ci_intr_depth; /* */
- struct cpu_softc *ci_softc; /* platform softc */
- lwp_t *ci_softlwps[SOFTINT_COUNT];
- volatile uint32_t ci_softints;
- lwp_t *ci_curlwp; /* current lwp */
- lwp_t *ci_lastlwp; /* last lwp */
- struct evcnt ci_arm700bugcount;
- int32_t ci_mtx_count;
- int ci_mtx_oldspl;
- register_t ci_undefsave[3];
- uint32_t ci_vfp_id;
- uint64_t ci_lastintr;
- struct pmap_tlb_info *ci_tlb_info;
- struct pmap *ci_pmap_lastuser;
- struct pmap *ci_pmap_cur;
- tlb_asid_t ci_pmap_asid_cur;
- struct trapframe *ci_ddb_regs;
- struct evcnt ci_abt_evs[16];
- struct evcnt ci_und_ev;
- struct evcnt ci_und_cp15_ev;
- struct evcnt ci_vfp_evs[3];
+ struct cpu_data ci_data; /* MI per-cpu data */
+ device_t ci_dev; /* Device corresponding to this CPU */
+ cpuid_t ci_cpuid;
+ uint32_t ci_arm_cpuid; /* aggregate CPU id */
+ uint32_t ci_arm_cputype; /* CPU type */
+ uint32_t ci_arm_cpurev; /* CPU revision */
+ uint32_t ci_ctrl; /* The CPU control register */
+ int ci_cpl; /* current processor level (spl) */
+ volatile int ci_astpending; /* */
+ int ci_want_resched;/* resched() was called */
+ int ci_intr_depth; /* */
+
+ struct cpu_softc *
+ ci_softc; /* platform softc */
+
+ lwp_t * ci_softlwps[SOFTINT_COUNT];
+ volatile uint32_t
+ ci_softints;
+
+ lwp_t * ci_curlwp; /* current lwp */
+ lwp_t * ci_lastlwp; /* last lwp */
+
+ struct evcnt ci_arm700bugcount;
+ int32_t ci_mtx_count;
+ int ci_mtx_oldspl;
+ register_t ci_undefsave[3];
+ uint32_t ci_vfp_id;
+ uint64_t ci_lastintr;
+
+ struct pmap_tlb_info *
+ ci_tlb_info;
+ struct pmap * ci_pmap_lastuser;
+ struct pmap * ci_pmap_cur;
+ tlb_asid_t ci_pmap_asid_cur;
+
+ struct trapframe *
+ ci_ddb_regs;
+
+ struct evcnt ci_abt_evs[16];
+ struct evcnt ci_und_ev;
+ struct evcnt ci_und_cp15_ev;
+ struct evcnt ci_vfp_evs[3];
+
#if defined(MP_CPU_INFO_MEMBERS)
MP_CPU_INFO_MEMBERS
#endif
