Module Name:	syssrc
Committed By:	bjh21
Date:		Sun Oct 13 12:24:58 UTC 2002

Modified Files:
	syssrc/sys/arch/acorn32/acorn32: hydra.c
	syssrc/sys/arch/acorn32/include: cpu.h
	syssrc/sys/arch/arm/arm32: cpu.c fault.c
	syssrc/sys/arch/arm/include: cpu.h

Log Message:
It appears that MI code requires ci_cpuid to be the CPU number of the CPU
in question, whereas the ARM code was using it to hold the model
identification.  To fix this, rename:

ci_cpuid -> ci_arm_cpuid
ci_cputype -> ci_arm_cputype (for consistency)
ci_cpurev -> ci_arm_cpurev (ditto)
ci_cpunum -> ci_cpuid

This makes top(1) give correct CPU numbers in its "STATE" column (all 0 for
now).


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 syssrc/sys/arch/acorn32/acorn32/hydra.c
cvs rdiff -r1.5 -r1.6 syssrc/sys/arch/acorn32/include/cpu.h
cvs rdiff -r1.43 -r1.44 syssrc/sys/arch/arm/arm32/cpu.c
cvs rdiff -r1.24 -r1.25 syssrc/sys/arch/arm/arm32/fault.c
cvs rdiff -r1.31 -r1.32 syssrc/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.