diff options
| author | Toomas Soome <tsoome@me.com> | 2021-03-18 23:59:22 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-10-19 09:26:54 +0300 |
| commit | a2cd9e1884647e1e412c282879881873b71c84df (patch) | |
| tree | dd481b3c130ddfd533f1db594793d4222c2a51f3 /usr/src/psm/stand/boot | |
| parent | f8871fbc1b7e2d91a441e896a3436e6a76f21bc0 (diff) | |
| download | illumos-gate-a2cd9e1884647e1e412c282879881873b71c84df.tar.gz | |
14069 inetboot: multiply-defined symbols
Reviewed by: Klaus Ziegler <klausz@haus-gisela.de>
Approved by: Robert Mustacchi <rm@fingolfin.org>
Diffstat (limited to 'usr/src/psm/stand/boot')
| -rw-r--r-- | usr/src/psm/stand/boot/common/readfile.c | 2 | ||||
| -rw-r--r-- | usr/src/psm/stand/boot/sparc/common/bootprop.c | 4 | ||||
| -rw-r--r-- | usr/src/psm/stand/boot/sparc/common/sun4x_standalloc.c | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/psm/stand/boot/common/readfile.c b/usr/src/psm/stand/boot/common/readfile.c index de3a890ff8..16eea78fe3 100644 --- a/usr/src/psm/stand/boot/common/readfile.c +++ b/usr/src/psm/stand/boot/common/readfile.c @@ -64,7 +64,7 @@ int npagesize = 0; uint_t icache_flush = 0; char *cpulist = NULL; char *mmulist = NULL; -char *module_path; /* path for kernel modules */ +extern char *module_path; /* path for kernel modules */ /* * This file gets compiled in LP64 (for sun4u) and ILP32 models. diff --git a/usr/src/psm/stand/boot/sparc/common/bootprop.c b/usr/src/psm/stand/boot/sparc/common/bootprop.c index 967a2f7e06..b5e16520d3 100644 --- a/usr/src/psm/stand/boot/sparc/common/bootprop.c +++ b/usr/src/psm/stand/boot/sparc/common/bootprop.c @@ -35,11 +35,11 @@ char *v2path, *kernname, *systype; char *my_own_name = "boot"; char v2args_buf[V2ARGS_BUF_SZ]; char *v2args = v2args_buf; -char *mfg_name; +extern char *mfg_name; char *impl_arch_name; char *bootp_response; char *module_path; -int cache_state; +extern int cache_state; uint64_t memlistextent; /* replacement for old member of bootops */ /* These are the various memory lists */ diff --git a/usr/src/psm/stand/boot/sparc/common/sun4x_standalloc.c b/usr/src/psm/stand/boot/sparc/common/sun4x_standalloc.c index a68c6d0d47..00bc894ae7 100644 --- a/usr/src/psm/stand/boot/sparc/common/sun4x_standalloc.c +++ b/usr/src/psm/stand/boot/sparc/common/sun4x_standalloc.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/saio.h> #include <sys/sysmacros.h> @@ -45,10 +43,10 @@ extern struct memlist *vfreelistp, *pfreelistp; extern void reset_alloc(void); extern void alloc_segment(caddr_t); -caddr_t memlistpage; +extern caddr_t memlistpage; caddr_t le_page; caddr_t ie_page; -caddr_t scratchmemp; +caddr_t scratchmemp; extern int pagesize; #define N_FREELIST 20 /* keep the largest 20 free regions */ |