diff options
| author |   miod <miod@openbsd.org> | 2012-12-26 22:32:13 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2012-12-26 22:32:13 +0000 |
| commit | a5fda35aa159ffa2598817e9c81d95b2f4e84f9a (patch) | |
| tree | 01491d298481b40d7a6691a0465a80725cba9ac7 | |
| parent | Actually invoke the system call in libc's sigreturn() wrapper; went unnoticed (diff) | |
| download | wireguard-openbsd-a5fda35aa159ffa2598817e9c81d95b2f4e84f9a.tar.xz wireguard-openbsd-a5fda35aa159ffa2598817e9c81d95b2f4e84f9a.zip | |
Nuke commons.
| -rw-r--r-- | sys/arch/aviion/aviion/machdep.c | 7 | ||||
| -rw-r--r-- | sys/arch/luna88k/luna88k/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/machdep.c | 3 |
3 files changed, 7 insertions, 11 deletions
diff --git a/sys/arch/aviion/aviion/machdep.c b/sys/arch/aviion/aviion/machdep.c index e17a1f24e7e..281a70b766b 100644 --- a/sys/arch/aviion/aviion/machdep.c +++ b/sys/arch/aviion/aviion/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.48 2012/10/08 21:47:47 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.49 2012/12/26 22:32:13 miod Exp $ */ /* * Copyright (c) 2007 Miodrag Vallat. * @@ -163,9 +163,6 @@ u_int aviion_delay_const = 33; vaddr_t first_addr; vaddr_t last_addr; -vaddr_t avail_start, avail_end; -vaddr_t virtual_avail, virtual_end; - extern struct user *proc0paddr; /* @@ -684,6 +681,8 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) void aviion_bootstrap() { + vaddr_t avail_start; + extern vaddr_t avail_end; extern char *end; #ifndef MULTIPROCESSOR cpuid_t master_cpu; diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c index d73e082d11f..e510a4d42bf 100644 --- a/sys/arch/luna88k/luna88k/machdep.c +++ b/sys/arch/luna88k/luna88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.84 2012/10/21 09:51:59 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.85 2012/12/26 22:32:13 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -219,7 +219,6 @@ extern char *esym; int machtype = LUNA_88K; /* may be overwritten in cpu_startup() */ int cputyp = CPU_88100; -int boothowto; /* XXX: should be set in boot loader and locore.S */ int bootdev; /* XXX: should be set in boot loader and locore.S */ int cpuspeed = 33; /* safe guess */ int sysconsole = 1; /* 0 = ttya, 1 = keyboard/mouse, used in dev/sio.c */ @@ -235,9 +234,6 @@ extern void ws_cnattach(void); /* in dev/lunaws.c */ vaddr_t first_addr; vaddr_t last_addr; -vaddr_t avail_start, avail_end; -vaddr_t virtual_avail, virtual_end; - extern struct user *proc0paddr; /* @@ -992,6 +988,8 @@ luna88k_bootstrap() { extern struct cmmu_p cmmu8820x; extern char *end; + vaddr_t avail_start; + extern vaddr_t avail_end; #ifndef MULTIPROCESSOR cpuid_t master_cpu; #endif diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index 1f30e9f6928..a85e58cdb07 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.247 2012/10/21 09:51:59 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.248 2012/12/26 22:32:13 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -161,7 +161,6 @@ struct uvm_constraint_range *uvm_md_constraints[] = { NULL }; char machine[] = MACHINE; /* cpu "architecture" */ char cpu_model[120]; -int boothowto; /* set in locore.S */ int bootdev; /* set in locore.S */ int cputyp; /* set in locore.S */ int brdtyp; /* set in locore.S */ |