Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bit rot so that MP kernel compiles s/cpu_no/ci_cpuid/

This commit is contained in:
christos 2001-01-21 07:48:29 +00:00
parent ce8aa899c9
commit 9bd2dee3b2
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/sparc/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.41 2000/08/25 01:04:11 thorpej Exp $ */
/* $NetBSD: cpu.h,v 1.42 2001/01/21 07:48:29 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@ -83,7 +83,7 @@
#define cpu_swapin(p) /* nothing */
#define cpu_swapout(p) /* nothing */
#define cpu_wait(p) /* nothing */
#define cpu_number() (cpuinfo.cpu_no)
#define cpu_number() (cpuinfo.ci_cpuid)
#if defined(MULTIPROCESSOR)
void cpu_boot_secondary_processors __P((void));

4
sys/arch/sparc/sparc/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.109 2000/11/11 12:12:46 pk Exp $ */
/* $NetBSD: cpu.c,v 1.110 2001/01/21 07:48:30 christos Exp $ */
/*
* Copyright (c) 1996
@ -333,7 +333,7 @@ static int cpu_instance;
#endif
cpus[cpu_instance] = cpi;
cpi->cpu_no = cpu_instance++;
cpi->ci_cpuid = cpu_instance++;
cpi->mid = mid;
cpi->node = node;

4
sys/arch/sparc/sparc/cpuvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpuvar.h,v 1.29 2000/06/27 16:51:44 pk Exp $ */
/* $NetBSD: cpuvar.h,v 1.30 2001/01/21 07:48:30 christos Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -159,7 +159,7 @@ struct cpu_info {
int mmu_vers; /* MMU version code */
int master; /* 1 if this is bootup CPU */
int cpu_no; /* CPU index (see cpus[] array) */
int ci_cpuid; /* CPU index (see cpus[] array) */
int mid; /* Module ID for MP systems */
int mbus; /* 1 if CPU is on MBus */
int mxcc; /* 1 if a MBus-level MXCC is present */

4
sys/arch/sparc/sparc/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.30 2000/06/29 07:40:10 mrg Exp $
# $NetBSD: genassym.cf,v 1.31 2001/01/21 07:48:30 christos Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -138,7 +138,7 @@ define V_FAULTS offsetof(struct uvmexp, faults)
# CPU info structure
define CPUINFO_STRUCTSIZE sizeof(struct cpu_info)
define CPUINFO_CPUNO offsetof(struct cpu_info, cpu_no)
define CPUINFO_CPUNO offsetof(struct cpu_info, ci_cpuid)
define CPUINFO_GETSYNCFLT offsetof(struct cpu_info, get_syncflt)
define CPUINFO_GETASYNCFLT offsetof(struct cpu_info, get_asyncflt)
define CPUINFO_PURE_VCACHE_FLS offsetof(struct cpu_info, pure_vcache_flush)

6
sys/arch/sparc/sparc/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.175 2001/01/14 02:03:48 thorpej Exp $ */
/* $NetBSD: pmap.c,v 1.176 2001/01/21 07:48:30 christos Exp $ */
/*
* Copyright (c) 1996
@ -3518,8 +3518,8 @@ pmap_alloc_cpu(sc)
* address) in the CPU's slot in the kernel pmap region table
* pointer table.
*/
pmap_kernel()->pm_reg_ptps[sc->cpu_no] = regtable;
pmap_kernel()->pm_reg_ptps_pa[sc->cpu_no] = (paddr_t)regtable_pa;
pmap_kernel()->pm_reg_ptps[sc->ci_cpuid] = regtable;
pmap_kernel()->pm_reg_ptps_pa[sc->ci_cpuid] = (paddr_t)regtable_pa;
vr = VA_VREG(CPUINFO_VA);
vs = VA_VSEG(CPUINFO_VA);