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

cpu_info_store, machine, and machine_arch can all be shared by acorn26 and

Browse Source 
arm32, so share them.
This commit is contained in:
bjh21 2009-01-16 01:03:47 +00:00
parent 44e4eeea57
commit e26a7c553a
3 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/acorn26/acorn26/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.27 2009/01/16 00:44:43 bjh21 Exp $ */
/* $NetBSD: machdep.c,v 1.28 2009/01/16 01:03:47 bjh21 Exp $ */
/*-
* Copyright (c) 1998 Ben Harris
@ -32,7 +32,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2009/01/16 00:44:43 bjh21 Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2009/01/16 01:03:47 bjh21 Exp $");
#include <sys/buf.h>
#include <sys/kernel.h>
@ -55,18 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2009/01/16 00:44:43 bjh21 Exp $");
#include <machine/memcreg.h>
int physmem;
char machine[] = MACHINE;
char machine_arch[] = MACHINE_ARCH;
char cpu_model[] = "Archimedes";
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store = {
.ci_cpl = IPL_HIGH,
#ifndef PROCESS_ID_IS_CURLWP
.ci_curlwp = &lwp0,
#endif
};
struct vm_map *phys_map = NULL;
struct vm_map *mb_map = NULL; /* and ever more shall be so */

17
sys/arch/arm/arm/arm_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: arm_machdep.c,v 1.23 2009/01/16 00:44:43 bjh21 Exp $ */
/* $NetBSD: arm_machdep.c,v 1.24 2009/01/16 01:03:47 bjh21 Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@ -72,13 +72,14 @@
*/
#include "opt_execfmt.h"
#include "opt_cpuoptions.h"
#include "opt_cputypes.h"
#include "opt_arm_debug.h"
#include "opt_sa.h"
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.23 2009/01/16 00:44:43 bjh21 Exp $");
__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.24 2009/01/16 01:03:47 bjh21 Exp $");
#include <sys/exec.h>
#include <sys/proc.h>
@ -95,6 +96,18 @@ __KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.23 2009/01/16 00:44:43 bjh21 Exp $
#include <machine/pcb.h>
#include <machine/vmparam.h>
/* the following is used externally (sysctl_hw) */
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store = {
.ci_cpl = IPL_HIGH,
#ifndef PROCESS_ID_IS_CURLWP
.ci_curlwp = &lwp0,
#endif
};
/*
* The ARM architecture places the vector page at address 0.
* Later ARM architecture versions, however, allow it to be

17
sys/arch/arm/arm32/arm32_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: arm32_machdep.c,v 1.60 2009/01/16 00:44:43 bjh21 Exp $ */
/* $NetBSD: arm32_machdep.c,v 1.61 2009/01/16 01:03:47 bjh21 Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -42,10 +42,9 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.60 2009/01/16 00:44:43 bjh21 Exp $");
__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.61 2009/01/16 01:03:47 bjh21 Exp $");
#include "opt_md.h"
#include "opt_cpuoptions.h"
#include "opt_pmap_debug.h"
#include <sys/param.h>
@ -82,18 +81,6 @@ extern size_t md_root_size; /* Memory disc size */
pv_addr_t kernelstack;
/* the following is used externally (sysctl_hw) */
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store = {
.ci_cpl = IPL_HIGH,
#ifndef PROCESS_ID_IS_CURLWP
.ci_curlwp = &lwp0,
#endif
};
void * msgbufaddr;
extern paddr_t msgbufphys;