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 /device | |
| 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 'device')
| -rw-r--r-- | device/ds_routines.c | 1 | ||||
| -rw-r--r-- | device/io_req.h | 2 | ||||
| -rw-r--r-- | device/tty.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/device/ds_routines.c b/device/ds_routines.c index 1fabec3c..fc051e8f 100644 --- a/device/ds_routines.c +++ b/device/ds_routines.c @@ -132,6 +132,7 @@ static struct device_emulation_ops *emulation_list[] = static struct vm_map device_io_map_store; vm_map_t device_io_map = &device_io_map_store; +struct kmem_cache io_inband_cache; #define NUM_EMULATION (sizeof (emulation_list) / sizeof (emulation_list[0])) diff --git a/device/io_req.h b/device/io_req.h index 1ad46801..b80b3dde 100644 --- a/device/io_req.h +++ b/device/io_req.h @@ -137,6 +137,6 @@ void iodone(io_req_t); (kfree((vm_offset_t)(ior), sizeof(struct io_req))) -struct kmem_cache io_inband_cache; /* for inband reads */ +extern struct kmem_cache io_inband_cache; /* for inband reads */ #endif /* _IO_REQ_ */ diff --git a/device/tty.h b/device/tty.h index ea6f4404..0bdb2db9 100644 --- a/device/tty.h +++ b/device/tty.h @@ -125,7 +125,7 @@ extern void ttychars( #define TTMINBUF 90 -short tthiwat[NSPEEDS], ttlowat[NSPEEDS]; +extern short tthiwat[NSPEEDS], ttlowat[NSPEEDS]; #define TTHIWAT(tp) tthiwat[(tp)->t_ospeed] #define TTLOWAT(tp) ttlowat[(tp)->t_ospeed] |