From 2b4bff9914d57bff600ac70194b8b1aab3485bee Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 31 Aug 2011 00:18:07 +0200 Subject: Fix declarations * device/ds_routines.h (io_done_list): Add variable declaration. (device_io_map): Keep variable declaration and move definition to... * device/ds_routines.c: ... here. * i386/i386/fpu.c: Include (curr_ipl): Remove declaration. (fpintr): Add int unit parameter. * linux/dev/glue/glue.h: New header. * i386/i386/fpu.h (fpintr): Add function prototype. * i386/i386/hardclock.c (clock_interrupt, linux_timer_intr): Remove prototypes. [LINUX_DEV]: Include * i386/i386/ipl.h (curr_ipl): Add declaration. * i386/i386/pic.h (curr_pic_mask, pic_mask, prtnull, intnull): Add declarations. * i386/i386at/kd.h (kdintr): Add declaration. * i386/i386at/pic_isa.c: Include and (intnull, fpintr, hardclock, kdintr, prtnull): Remove prototypes. * i386/xen/xen.c: Include (clock_interrupt): Remove prototype. * linux/dev/arch/i386/kernel/irq.c: Include and (linux_timer_intr, splhigh, spl0, curr_ipl, curr_pic_mask, pic_mask, get_options): Remove declarations. * linux/dev/drivers/block/floppy.c: Include (issig, get_options): Remove declarations. * linux/dev/drivers/block/genhd.c: Include (linux_intr_pri): Remove declaration. * linux/dev/glue/block.c: Include and . (device_io_map, blksize_size): Remove declarations. * linux/dev/glue/kmem.c: Include and (alloc_contig_mem, printf): Remove declarations. * linux/dev/glue/misc.c: Include and (vm_map_lookup_entry, printf): Remove prototypes. * linux/dev/glue/net.c: Include , and . (linux_intr_pri, io_done_list): Remove declarations. * linux/dev/init/main.c: Include and . (phys_last_addr, alloc_contig_mem, free_contig_mem, init_IRQ, restore_IRQ, startrtclock, linux_version_init, linux_kmem_init, pci_init, linux_net_emulation_init, device_setup, linux_printk, linux_timer_intr, spl0, splhigh, form_pic_mask, linux_bad_intr, prtnull, intnull, linux_sched_init, pcmcia_init): Remove declarations. * linux/dev/kernel/sched.c: Include , and . (alloc_contig_mem, free_contig_mem, splhigh, splx, linux_soft_intr, issig, printf, linux_auto_config): Remove prototypes. * linux/dev/kernel/softirq.c: Include . * linux/src/drivers/block/floppy.c: Include . (get_options): Remove prototype. * linux/src/init/main.c: Include (init_IRQ): Remove prototype. --- linux/dev/glue/block.c | 10 ++-------- linux/dev/glue/glue.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ linux/dev/glue/kmem.c | 4 ++-- linux/dev/glue/misc.c | 6 ++---- linux/dev/glue/net.c | 6 ++++-- 5 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 linux/dev/glue/glue.h (limited to 'linux/dev/glue') diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index f28644e..c995638 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -61,6 +61,7 @@ #include #include #include +#include /* TODO. This should be fixed to not be i386 specific. */ #include @@ -78,9 +79,7 @@ #include #include -extern int linux_auto_config; -extern int linux_intr_pri; -extern int linux_to_mach_error (int); +#include /* This task queue is not used in Mach: just for fixing undefined symbols. */ DECLARE_TASK_QUEUE (tq_disk); @@ -193,9 +192,6 @@ int read_ahead[MAX_BLKDEV] = {0, }; This is unused in Mach. It is here to make drivers compile. */ struct wait_queue *wait_for_request = NULL; -/* Map for allocating device memory. */ -extern vm_map_t device_io_map; - /* Initialize block drivers. */ int blk_dev_init () @@ -276,8 +272,6 @@ unregister_blkdev (unsigned major, const char *name) void set_blocksize (kdev_t dev, int size) { - extern int *blksize_size[]; - if (! blksize_size[MAJOR (dev)]) return; diff --git a/linux/dev/glue/glue.h b/linux/dev/glue/glue.h new file mode 100644 index 0000000..5d4f6d8 --- /dev/null +++ b/linux/dev/glue/glue.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2011 Free Software Foundation + * + * This program is free software ; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation ; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY ; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with the program ; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef LINUX_DEV_GLUE_GLUE_H +#define LINUX_DEV_GLUE_GLUE_H + +#include +#include + +extern int linux_auto_config; +extern int linux_intr_pri; + +extern void *alloc_contig_mem (unsigned, unsigned, unsigned, vm_page_t *); +extern void free_contig_mem (vm_page_t); +extern void init_IRQ (void); +extern void restore_IRQ (void); +extern void linux_kmem_init (void); +extern void linux_net_emulation_init (void); +extern void device_setup (void); +extern void linux_timer_intr (void); +extern void linux_bad_intr (int); +extern void linux_sched_init (void); +extern void pcmcia_init (void); +extern void linux_soft_intr (void); +extern int issig (void); +extern int linux_to_mach_error (int); +extern char *get_options(char *str, int *ints); + +#endif /* LINUX_DEV_GLUE_GLUE_H */ diff --git a/linux/dev/glue/kmem.c b/linux/dev/glue/kmem.c index 8c21ce7..d1784a5 100644 --- a/linux/dev/glue/kmem.c +++ b/linux/dev/glue/kmem.c @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -40,8 +41,7 @@ #include -extern void *alloc_contig_mem (unsigned, unsigned, unsigned, vm_page_t *); -extern int printf (const char *, ...); +#include /* Amount of memory to reserve for Linux memory allocator. We reserve 64K chunks to stay within DMA limits. diff --git a/linux/dev/glue/misc.c b/linux/dev/glue/misc.c index b467650..98c8248 100644 --- a/linux/dev/glue/misc.c +++ b/linux/dev/glue/misc.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -66,10 +67,7 @@ #include #include #include - -extern boolean_t vm_map_lookup_entry (register vm_map_t, register vm_offset_t, - vm_map_entry_t *); -extern int printf (const char *, ...); +#include int (*dispatch_scsi_info_ptr) (int ino, char *buffer, char **start, off_t offset, int length, int inout) = 0; diff --git a/linux/dev/glue/net.c b/linux/dev/glue/net.c index acb31ae..91ebf96 100644 --- a/linux/dev/glue/net.c +++ b/linux/dev/glue/net.c @@ -69,6 +69,8 @@ #include #include +#include + #include #include @@ -84,6 +86,7 @@ #include #include #include +#include #define MACH_INCLUDE #include @@ -97,7 +100,7 @@ #include #include -extern int linux_intr_pri; +#include /* One of these is associated with each instance of a device. */ struct net_data @@ -248,7 +251,6 @@ void dev_kfree_skb (struct sk_buff *skb, int mode) { unsigned flags; - extern void *io_done_list; /* Queue sk_buff on done list if there is a page list attached or we need to send a reply. -- cgit v1.2.3