diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-12 18:50:52 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-01-20 09:58:09 +0200 |
| commit | 0b35c8bcd86de836ba2ab241e3b4ac7955c4148c (patch) | |
| tree | 451c910c4ec3501a4fb1b594df7063d282f745c1 /usr/src | |
| parent | f976337ad91e7232287bf3bc0e038987a11a8949 (diff) | |
| download | illumos-joyent-0b35c8bcd86de836ba2ab241e3b4ac7955c4148c.tar.gz | |
13424 unix: multiply-defined symbols
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: C Fraire <cfraire@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/i86pc/os/startup.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/sys/cpupm_throttle.h | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/sys/machsystm.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr/src/uts/i86pc/os/startup.c b/usr/src/uts/i86pc/os/startup.c index f36e8b0e79..93fffa1b32 100644 --- a/usr/src/uts/i86pc/os/startup.c +++ b/usr/src/uts/i86pc/os/startup.c @@ -235,8 +235,8 @@ static void layout_kernel_va(void); pgcnt_t physmem = PHYSMEM; pgcnt_t obp_pages; /* Memory used by PROM for its text and data */ -char *kobj_file_buf; -int kobj_file_bufsize; /* set in /etc/system */ +extern char *kobj_file_buf; +extern int kobj_file_bufsize; /* set in /etc/system */ /* Global variables for MP support. Used in mp_startup */ caddr_t rm_platter_va = 0; @@ -321,7 +321,7 @@ static struct seg *segmap = &kmapseg; /* easier to use name for in here */ struct seg *segkp = &kpseg; /* Pageable kernel virtual memory segment */ -struct seg kvseg_core; /* Segment used for the core heap */ +extern struct seg kvseg_core; /* Segment used for the core heap */ struct seg kpmseg; /* Segment used for physical mapping */ struct seg *segkpm = &kpmseg; /* 64bit kernel physical mapping segment */ diff --git a/usr/src/uts/i86pc/sys/cpupm_throttle.h b/usr/src/uts/i86pc/sys/cpupm_throttle.h index 5a607158da..7f9006759f 100644 --- a/usr/src/uts/i86pc/sys/cpupm_throttle.h +++ b/usr/src/uts/i86pc/sys/cpupm_throttle.h @@ -32,7 +32,7 @@ extern "C" { #endif -cpupm_state_ops_t cpupm_throttle_ops; +extern cpupm_state_ops_t cpupm_throttle_ops; extern void cpupm_throttle_manage_notification(void *); diff --git a/usr/src/uts/i86pc/sys/machsystm.h b/usr/src/uts/i86pc/sys/machsystm.h index 5f286ca4c6..e1a84f991a 100644 --- a/usr/src/uts/i86pc/sys/machsystm.h +++ b/usr/src/uts/i86pc/sys/machsystm.h @@ -135,10 +135,10 @@ extern uintptr_t (*get_intr_handler)(int, short); /* * Dispatcher hooks. */ -void (*idle_cpu)(); -void (*non_deep_idle_cpu)(); -void (*disp_enq_thread)(cpu_t *, int); -void (*non_deep_idle_disp_enq_thread)(cpu_t *, int); +extern void (*idle_cpu)(); +extern void (*non_deep_idle_cpu)(); +extern void (*disp_enq_thread)(cpu_t *, int); +extern void (*non_deep_idle_disp_enq_thread)(cpu_t *, int); #ifndef __xpv extern unsigned int microdata; |