# HG changeset patch
# User Toomas Soome <tsoome@me.com>
# Date 1589298652 -10800
# Node ID afda877311c6a6e9a477cdad2c2d312aefea1c0b
# Parent  1267e1e320be3b2b1f8ae88e15a41f9bc1fdeb86
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>

diff -r 1267e1e320be -r afda877311c6 usr/src/uts/i86pc/os/startup.c
--- a/usr/src/uts/i86pc/os/startup.c	Thu Jan 14 14:15:19 2021 +0000
+++ b/usr/src/uts/i86pc/os/startup.c	Tue May 12 18:50:52 2020 +0300
@@ -235,8 +235,8 @@
 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 @@
 
 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 -r 1267e1e320be -r afda877311c6 usr/src/uts/i86pc/sys/cpupm_throttle.h
--- a/usr/src/uts/i86pc/sys/cpupm_throttle.h	Thu Jan 14 14:15:19 2021 +0000
+++ b/usr/src/uts/i86pc/sys/cpupm_throttle.h	Tue May 12 18:50:52 2020 +0300
@@ -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 -r 1267e1e320be -r afda877311c6 usr/src/uts/i86pc/sys/machsystm.h
--- a/usr/src/uts/i86pc/sys/machsystm.h	Thu Jan 14 14:15:19 2021 +0000
+++ b/usr/src/uts/i86pc/sys/machsystm.h	Tue May 12 18:50:52 2020 +0300
@@ -135,10 +135,10 @@
 /*
  * 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;