From fc713515896de6dbbbcc61a8be54589bc657aefd Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 31 Mar 2020 23:39:20 +0200
Subject: 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.
---
linux/pcmcia-cs/modules/pci_fixup.c | 2 +-
linux/src/drivers/scsi/in2000.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'linux')
diff --git a/linux/pcmcia-cs/modules/pci_fixup.c b/linux/pcmcia-cs/modules/pci_fixup.c
index 3b5551ad..6cbcd03e 100644
--- a/linux/pcmcia-cs/modules/pci_fixup.c
+++ b/linux/pcmcia-cs/modules/pci_fixup.c
@@ -51,7 +51,6 @@ u32 pci_irq_mask = 0;
#ifndef MACH
/* Already defined in drivers/pci/pci.c. */
struct pci_dev *pci_devices = NULL;
-#endif
struct pci_bus pci_root = {
parent: NULL,
children: NULL,
@@ -61,6 +60,7 @@ struct pci_bus pci_root = {
number: 0
};
#endif
+#endif
#if (LINUX_VERSION_CODE < VERSION(2,1,93))
diff --git a/linux/src/drivers/scsi/in2000.h b/linux/src/drivers/scsi/in2000.h
index 52a86e06..732bab86 100644
--- a/linux/src/drivers/scsi/in2000.h
+++ b/linux/src/drivers/scsi/in2000.h
@@ -406,7 +406,7 @@ int in2000_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int in2000_abort(Scsi_Cmnd *);
void in2000_setup(char *, int *) in2000__INIT;
int in2000_proc_info(char *, char **, off_t, int, int, int);
-struct proc_dir_entry proc_scsi_in2000;
+extern struct proc_dir_entry proc_scsi_in2000;
int in2000_biosparam(struct scsi_disk *, kdev_t, int *);
int in2000_reset(Scsi_Cmnd *, unsigned int);
--
cgit v1.2.3