diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-31 23:39:20 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-31 23:39:20 +0200 |
| commit | fc713515896de6dbbbcc61a8be54589bc657aefd (patch) | |
| tree | d98775524dfe4626cda9ae4b7cf3a17fc3c85007 /kern | |
| parent | 2926f6f92dab25ba19c3e758931e6b3e34db1891 (diff) | |
Fix build with -fno-common
which will be the default in gcc-10.
* device/io_req.h (io_inband_cache): Add extern qualifier.
* device/tty.h (tthiwat, ttlowat): Likewise.
* i386/i386/db_machdep.h (ddb_regs): Likewise.
* kern/cpu_number.h (master_cpu): Likewise.
* kern/time_stamp.h (ts_tick_count): Likewise.
* linux/src/drivers/scsi/in2000.h (proc_scsi_in2000): Likewise.
* device/ds_routines.c (io_inband_cache): New variable.
* i386/i386/db_interface.c (ddb_regs): Likewise.
* kern/processor.c (master_cpu): Likewise.
* kern/time_stamp.c (ts_tick_count): Likewise.
* linux/pcmcia-cs/modules/pci_fixup.c (pci_root): Remove variable.
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/cpu_number.h | 2 | ||||
| -rw-r--r-- | kern/processor.c | 2 | ||||
| -rw-r--r-- | kern/time_stamp.c | 2 | ||||
| -rw-r--r-- | kern/time_stamp.h | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/kern/cpu_number.h b/kern/cpu_number.h index 5d3e4bd1..e7b65324 100644 --- a/kern/cpu_number.h +++ b/kern/cpu_number.h @@ -31,7 +31,7 @@ * Definitions for cpu identification in multi-processors. */ -int master_cpu; /* 'master' processor - keeps time */ +extern int master_cpu; /* 'master' processor - keeps time */ #if (NCPUS == 1) /* cpu number is always 0 on a single processor system */ diff --git a/kern/processor.c b/kern/processor.c index dffd7d0b..6ed716d3 100644 --- a/kern/processor.c +++ b/kern/processor.c @@ -55,6 +55,8 @@ struct kmem_cache pset_cache; /* * Exported variables. */ +int master_cpu; + struct processor_set default_pset; struct processor processor_array[NCPUS]; diff --git a/kern/time_stamp.c b/kern/time_stamp.c index ee141a0e..b8ac9d82 100644 --- a/kern/time_stamp.c +++ b/kern/time_stamp.c @@ -29,6 +29,8 @@ #include <sys/time.h> #include <kern/time_stamp.h> +unsigned ts_tick_count; + /* * ts.c - kern_timestamp system call. */ diff --git a/kern/time_stamp.h b/kern/time_stamp.h index becaae1b..2492e522 100644 --- a/kern/time_stamp.h +++ b/kern/time_stamp.h @@ -52,7 +52,7 @@ struct tsval { #define TS_FORMAT 1 #if KERNEL -unsigned ts_tick_count; +extern unsigned ts_tick_count; #endif /* KERNEL */ #endif /* TS_FORMAT */ |