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. --- i386/i386/fpu.c | 4 ++-- i386/i386/fpu.h | 1 + i386/i386/hardclock.c | 7 +++---- i386/i386/ipl.h | 1 + i386/i386/pic.h | 4 ++++ i386/i386at/kd.h | 2 ++ i386/i386at/pic_isa.c | 6 +++--- i386/xen/xen.c | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) (limited to 'i386') diff --git a/i386/i386/fpu.c b/i386/i386/fpu.c index 2a4b9c0..2626a38 100644 --- a/i386/i386/fpu.c +++ b/i386/i386/fpu.c @@ -52,12 +52,12 @@ #include #include #include +#include #include #include "cpu_number.h" #if 0 #include -extern int curr_ipl; #define ASSERT_IPL(L) \ { \ if (curr_ipl != L) { \ @@ -865,7 +865,7 @@ fp_state_alloc() * This comes in on line 5 of the slave PIC at SPL1. */ void -fpintr() +fpintr(int unit) { spl_t s; thread_t thread = current_thread(); diff --git a/i386/i386/fpu.h b/i386/i386/fpu.h index 1a1b61f..2156187 100644 --- a/i386/i386/fpu.h +++ b/i386/i386/fpu.h @@ -124,5 +124,6 @@ extern void fpextovrflt(void); extern void fpexterrflt(void); extern void fpastintr(void); extern void init_fpu(void); +extern void fpintr(int unit); #endif /* _I386_FPU_H_ */ diff --git a/i386/i386/hardclock.c b/i386/i386/hardclock.c index c97feac..aecd3a3 100644 --- a/i386/i386/hardclock.c +++ b/i386/i386/hardclock.c @@ -39,13 +39,12 @@ #include #endif -extern void clock_interrupt(); -extern char return_to_iret[]; - #ifdef LINUX_DEV -extern void linux_timer_intr(void); +#include #endif +extern char return_to_iret[]; + void hardclock(iunit, old_ipl, ret_addr, regs) int iunit; /* 'unit' number */ diff --git a/i386/i386/ipl.h b/i386/i386/ipl.h index 557cd8d..8f729e1 100644 --- a/i386/i386/ipl.h +++ b/i386/i386/ipl.h @@ -73,5 +73,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. extern void (*ivect[])(); extern int iunit[]; extern int intpri[]; +extern spl_t curr_ipl; #endif /* __ASSEMBLER__ */ #endif /* KERNEL */ diff --git a/i386/i386/pic.h b/i386/i386/pic.h index 7a177d8..52f6ec1 100644 --- a/i386/i386/pic.h +++ b/i386/i386/pic.h @@ -179,6 +179,10 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef __ASSEMBLER__ extern void form_pic_mask (void); extern void picinit (void); +extern int curr_pic_mask; +extern int pic_mask[]; +extern void prtnull(int unit); +extern void intnull(int unit); #endif #endif /* _I386_PIC_H_ */ diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h index bc265b0..3f0dfe1 100644 --- a/i386/i386at/kd.h +++ b/i386/i386at/kd.h @@ -740,4 +740,6 @@ extern void kd_slmwd (void *start, int count, int value); extern void kd_slmscu (void *from, void *to, int count); extern void kd_slmscd (void *from, void *to, int count); +extern void kdintr(int vec, int regs); + #endif /* _KD_H_ */ diff --git a/i386/i386at/pic_isa.c b/i386/i386at/pic_isa.c index ef7d84c..e48fb50 100644 --- a/i386/i386at/pic_isa.c +++ b/i386/i386at/pic_isa.c @@ -27,11 +27,11 @@ #include #include #include - +#include +#include /* These interrupts are always present */ -extern void intnull(), fpintr(), hardclock(), kdintr(); -extern void prtnull(); +extern void hardclock(); void (*ivect[NINTR])() = { /* 00 */ hardclock, /* always */ diff --git a/i386/xen/xen.c b/i386/xen/xen.c index 87a1ed9..a46ee2c 100644 --- a/i386/xen/xen.c +++ b/i386/xen/xen.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -43,7 +44,6 @@ void hyp_failsafe_c_callback(struct failsafe_callback_regs *regs) { panic("failsafe"); } -extern void clock_interrupt(); extern void return_to_iret; void hypclock_machine_intr(int old_ipl, void *ret_addr, struct i386_interrupt_state *regs, unsigned64_t delta) { -- cgit v1.2.3