diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-04 15:00:27 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-04 15:00:27 +0000 |
| commit | 8725bd0621d927b5c94792b68fe2660400146d71 (patch) | |
| tree | ed3a59edd2dc2d6310e7a3eaf01ef3b7622a0a7e /sys/arch/mvme88k | |
| parent | 639f68c9d1197b1b43c4e16be900a3b73eea1c6f (diff) | |
Let cmmu_init() now return the cpuid of the master cpu.
Diffstat (limited to 'sys/arch/mvme88k')
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/m88110.c | 10 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/machdep.c | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/arch/mvme88k/mvme88k/m88110.c b/sys/arch/mvme88k/mvme88k/m88110.c index 46d30d6706a..18ddd7806a6 100644 --- a/sys/arch/mvme88k/mvme88k/m88110.c +++ b/sys/arch/mvme88k/mvme88k/m88110.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m88110.c,v 1.33 2005/12/04 12:20:19 miod Exp $ */ +/* $OpenBSD: m88110.c,v 1.34 2005/12/04 15:00:26 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * All rights reserved. @@ -71,7 +71,7 @@ #include <machine/psl.h> #include <machine/trap.h> -void m88110_init(void); +cpuid_t m88110_init(void); void m88110_setup_board_config(void); void m88110_cpu_configuration_print(int); void m88110_shutdown(void); @@ -153,7 +153,7 @@ m88110_cpu_configuration_print(int master) printf("cpu%d: ", cpu); switch (proctype) { default: - printf("unknown model arch 0x%x version 0x%x\n", + printf("unknown model arch 0x%x version 0x%x", proctype, procvers); break; case ARN_88110: @@ -171,7 +171,7 @@ m88110_cpu_configuration_print(int master) /* * CMMU initialization routine */ -void +cpuid_t m88110_init(void) { int i; @@ -212,6 +212,8 @@ m88110_init(void) set_isr(0); set_dsr(0); + + return (m88110_cpu_number()); } /* diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index 95c22a466c4..49f1cc7cb20 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.172 2005/12/04 12:20:19 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.173 2005/12/04 15:00:26 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -563,7 +563,7 @@ allocsys(v) __dead void _doboot() { - cmmu_shutdown_now(); + cmmu_shutdown(); bugreturn(); /*NOTREACHED*/ for (;;); /* appease gcc */ @@ -1032,7 +1032,7 @@ mvme_bootstrap() extern struct consdev *cn_tab; struct mvmeprom_brdid brdid; #ifndef MULTIPROCESSOR - u_int master_cpu; + cpuid_t master_cpu; #endif buginit(); @@ -1094,8 +1094,7 @@ mvme_bootstrap() physmem = btoc(last_addr); setup_board_config(); - cmmu_init(); - master_cpu = cmmu_cpu_number(); + master_cpu = cmmu_init(); set_cpu_number(master_cpu); /* |