From c706c9321eaf9c4dd6c462428708759dbf5a1cc4 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 25 Aug 2011 15:22:34 +0200 Subject: Remove unused variables * vm/memory_object_proxy.c (memory_object_create_proxy): Remove unused `kr' variable. * linux/dev/glue/block.c (free_buffer): Remove unused `i' variable. (register_blkdev): Remove unused `err' variable. (unregister_blkdev): Likewise. (bread): Likewise. (init_partition): Likewise. * linux/dev/glue/net.c (device_write): Likewise. --- linux/dev/glue/net.c | 1 - 1 file changed, 1 deletion(-) (limited to 'linux/dev/glue/net.c') diff --git a/linux/dev/glue/net.c b/linux/dev/glue/net.c index 095428d3..acb31ae7 100644 --- a/linux/dev/glue/net.c +++ b/linux/dev/glue/net.c @@ -425,7 +425,6 @@ device_write (void *d, ipc_port_t reply_port, { unsigned char *p; int i, amt, skblen, s; - io_return_t err = 0; vm_map_copy_t copy = (vm_map_copy_t) data; struct net_data *nd = d; struct linux_device *dev = nd->dev; -- cgit v1.2.3 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. --- device/ds_routines.c | 2 ++ device/ds_routines.h | 4 +++- 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 +- linux/dev/arch/i386/kernel/irq.c | 13 ++---------- linux/dev/drivers/block/floppy.c | 5 ++--- linux/dev/drivers/block/genhd.c | 3 +-- 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 ++++-- linux/dev/init/main.c | 26 ++---------------------- linux/dev/kernel/sched.c | 13 ++++-------- linux/dev/kernel/softirq.c | 2 ++ linux/src/drivers/block/floppy.c | 4 ++-- linux/src/init/main.c | 3 ++- 23 files changed, 93 insertions(+), 79 deletions(-) create mode 100644 linux/dev/glue/glue.h (limited to 'linux/dev/glue/net.c') diff --git a/device/ds_routines.c b/device/ds_routines.c index 2173ddff..d4a08fb1 100644 --- a/device/ds_routines.c +++ b/device/ds_routines.c @@ -130,6 +130,8 @@ static struct device_emulation_ops *emulation_list[] = &mach_device_emulation_ops, }; +vm_map_t device_io_map; + #define NUM_EMULATION (sizeof (emulation_list) / sizeof (emulation_list[0])) io_return_t diff --git a/device/ds_routines.h b/device/ds_routines.h index e1f6aadb..a00a12d5 100644 --- a/device/ds_routines.h +++ b/device/ds_routines.h @@ -41,7 +41,9 @@ /* * Map for device IO memory. */ -vm_map_t device_io_map; +extern vm_map_t device_io_map; + +extern queue_head_t io_done_list; kern_return_t device_read_alloc(io_req_t, vm_size_t); kern_return_t device_write_get(io_req_t, boolean_t *); diff --git a/i386/i386/fpu.c b/i386/i386/fpu.c index 2a4b9c09..2626a38f 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 1a1b61f6..21561875 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 c97feac3..aecd3a30 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 557cd8df..8f729e1d 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 7a177d86..52f6ec16 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 bc265b08..3f0dfe16 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 ef7d84c7..e48fb507 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 87a1ed92..a46ee2c6 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) { diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c index 7faaa62c..d996c25c 100644 --- a/linux/dev/arch/i386/kernel/irq.c +++ b/linux/dev/arch/i386/kernel/irq.c @@ -47,10 +47,8 @@ #include #include -extern void linux_timer_intr (void); -extern spl_t splhigh (void); -extern spl_t spl0 (void); -extern void form_pic_mask (void); +#include +#include #if 0 /* XXX: This is the way it's done in linux 2.2. GNU Mach currently uses intr_count. It should be made using local_{bh/irq}_count instead (through hardirq_enter/exit) for SMP support. */ @@ -95,12 +93,6 @@ static struct linux_action *irq_action[16] = NULL, NULL, NULL, NULL }; -extern spl_t curr_ipl; -extern int curr_pic_mask; -extern int pic_mask[]; - -extern void intnull (), prtnull (); - /* * Generic interrupt handler for Linux devices. * Set up a fake `struct pt_regs' then call the real handler. @@ -446,7 +438,6 @@ static void show(char * str) int i; unsigned long *stack; int cpu = smp_processor_id(); - extern char *get_options(char *str, int *ints); printk("\n%s, CPU %d:\n", str, cpu); printk("irq: %d [%d %d]\n", diff --git a/linux/dev/drivers/block/floppy.c b/linux/dev/drivers/block/floppy.c index d3fcd6af..d297e617 100644 --- a/linux/dev/drivers/block/floppy.c +++ b/linux/dev/drivers/block/floppy.c @@ -177,6 +177,8 @@ static inline int __get_order(unsigned long size); #include #include /* for the compatibility eject ioctl */ +#include + #ifndef FLOPPY_MOTOR_MASK #define FLOPPY_MOTOR_MASK 0xf0 @@ -437,7 +439,6 @@ static int probing = 0; static volatile int command_status = FD_COMMAND_NONE, fdc_busy = 0; static struct wait_queue *fdc_wait = NULL, *command_done = NULL; #ifdef MACH -extern int issig (void); #define NO_SIGNAL (! issig () || ! interruptible) #else #define NO_SIGNAL (!(current->signal & ~current->blocked) || !interruptible) @@ -4172,8 +4173,6 @@ static void floppy_release_irq_and_dma(void) #ifdef MODULE -extern char *get_options(char *str, int *ints); - char *floppy=NULL; static void parse_floppy_cfg_string(char *cfg) diff --git a/linux/dev/drivers/block/genhd.c b/linux/dev/drivers/block/genhd.c index 68a27d51..84b3792c 100644 --- a/linux/dev/drivers/block/genhd.c +++ b/linux/dev/drivers/block/genhd.c @@ -39,6 +39,7 @@ #ifdef MACH #include +#include #endif #define SYS_IND(p) get_unaligned(&p->sys_ind) @@ -770,8 +771,6 @@ void device_setup(void) struct gendisk *p; int nr=0; #ifdef MACH - extern int linux_intr_pri; - linux_intr_pri = SPL5; #endif diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index f28644ef..c9956383 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 00000000..5d4f6d88 --- /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 8c21ce7d..d1784a5e 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 b4676504..98c8248f 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 acb31ae7..91ebf969 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. diff --git a/linux/dev/init/main.c b/linux/dev/init/main.c index 9ed35d3d..3a889832 100644 --- a/linux/dev/init/main.c +++ b/linux/dev/init/main.c @@ -39,6 +39,7 @@ #include #include #include +#include #define MACH_INCLUDE #include @@ -47,6 +48,7 @@ #include #include #include +#include #include #include @@ -83,30 +85,6 @@ struct drive_info_struct */ static void calibrate_delay (void); -extern vm_offset_t phys_last_addr; - -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 startrtclock (void); -extern void linux_version_init (void); -extern void linux_kmem_init (void); -extern unsigned long pci_init (unsigned long, unsigned long); -extern void linux_net_emulation_init (void); -extern void device_setup (void); -extern void linux_printk (char *,...); -extern int linux_timer_intr (void); -extern spl_t spl0 (void); -extern spl_t splhigh (void); -extern void form_pic_mask (void); -extern int linux_bad_intr (int); -extern int prtnull (); -extern int intnull (); -extern void linux_sched_init (void); -extern void pcmcia_init (void); - - /* * Amount of contiguous memory to allocate for initialization. */ diff --git a/linux/dev/kernel/sched.c b/linux/dev/kernel/sched.c index 7b5c5e43..0d2567f3 100644 --- a/linux/dev/kernel/sched.c +++ b/linux/dev/kernel/sched.c @@ -34,6 +34,9 @@ #include #include +#include + +#include #define MACH_INCLUDE #include @@ -41,21 +44,13 @@ #include #include #include +#include #include #include int securelevel = 0; -extern void *alloc_contig_mem (unsigned, unsigned, unsigned, vm_page_t *); -extern void free_contig_mem (vm_page_t); -extern spl_t splhigh (void); -extern spl_t splx (spl_t); -extern void linux_soft_intr (void); -extern int issig (void); -extern int printf (const char *, ...); -extern int linux_auto_config; - static void timer_bh (void); DECLARE_TASK_QUEUE (tq_timer); diff --git a/linux/dev/kernel/softirq.c b/linux/dev/kernel/softirq.c index 96102a7a..65a0962f 100644 --- a/linux/dev/kernel/softirq.c +++ b/linux/dev/kernel/softirq.c @@ -13,6 +13,8 @@ #include #include +#include + int bh_mask_count[32]; unsigned long bh_active = 0; unsigned long bh_mask = 0; diff --git a/linux/src/drivers/block/floppy.c b/linux/src/drivers/block/floppy.c index 0314a0b7..1b96c44f 100644 --- a/linux/src/drivers/block/floppy.c +++ b/linux/src/drivers/block/floppy.c @@ -177,6 +177,8 @@ static inline int __get_order(unsigned long size); #include #include /* for the compatibility eject ioctl */ +#include + #ifndef FLOPPY_MOTOR_MASK #define FLOPPY_MOTOR_MASK 0xf0 @@ -4167,8 +4169,6 @@ static void floppy_release_irq_and_dma(void) #ifdef MODULE -extern char *get_options(char *str, int *ints); - char *floppy=NULL; static void parse_floppy_cfg_string(char *cfg) diff --git a/linux/src/init/main.c b/linux/src/init/main.c index d41ec60c..1aa15b97 100644 --- a/linux/src/init/main.c +++ b/linux/src/init/main.c @@ -42,6 +42,8 @@ #include +#include + /* * Versions of gcc older than that listed below may actually compile * and link okay, but the end product can have subtle run time bugs. @@ -64,7 +66,6 @@ extern int bdflush(void *); extern int kswapd(void *); extern void kswapd_setup(void); -extern void init_IRQ(void); extern void init_modules(void); extern long console_init(long, long); extern long kmalloc_init(long,long); -- cgit v1.2.3 From 5988ae8fb41ace936e48e5a972abe1c5acc8f8af Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Sat, 17 Dec 2011 15:54:47 +0000 Subject: Fix kern/kalloc.h includes * device/dev_pager.c: Remove #include . * i386/i386/io_perm.c: Add #include . * kern/bootstrap.c: Likewise. * kern/ipc_tt.c: Likewise. * kern/pc_sample.c: Likewise. * kern/processor.c: Likewise. * kern/server_loop.ch: Likewise. * kern/thread.c: Likewise. * linux/dev/glue/block.c: Likewise. * linux/dev/glue/net.c: Likewise. * vm/vm_map.c: Likewise. * xen/block.c: Likewise. * xen/net.c: Likewise. * xen/store.c: Likewise. --- device/dev_pager.c | 1 - i386/i386/io_perm.c | 1 + kern/bootstrap.c | 1 + kern/ipc_tt.c | 1 + kern/pc_sample.c | 1 + kern/processor.c | 1 + kern/server_loop.ch | 1 + kern/thread.c | 1 + linux/dev/glue/block.c | 2 ++ linux/dev/glue/net.c | 1 + vm/vm_map.c | 1 + xen/block.c | 1 + xen/net.c | 1 + xen/store.c | 1 + 14 files changed, 14 insertions(+), 1 deletion(-) (limited to 'linux/dev/glue/net.c') diff --git a/device/dev_pager.c b/device/dev_pager.c index dc5ba732..bc58a155 100644 --- a/device/dev_pager.c +++ b/device/dev_pager.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include diff --git a/i386/i386/io_perm.c b/i386/i386/io_perm.c index 7dcb8581..8bacb8d5 100644 --- a/i386/i386/io_perm.c +++ b/i386/i386/io_perm.c @@ -55,6 +55,7 @@ #include #include +#include #include #include #include diff --git a/kern/bootstrap.c b/kern/bootstrap.c index 2c63df40..68f40b4f 100644 --- a/kern/bootstrap.c +++ b/kern/bootstrap.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include diff --git a/kern/ipc_tt.c b/kern/ipc_tt.c index de4edc65..6d32e5b0 100644 --- a/kern/ipc_tt.c +++ b/kern/ipc_tt.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/kern/pc_sample.c b/kern/pc_sample.c index c82707b2..2cec907b 100644 --- a/kern/pc_sample.c +++ b/kern/pc_sample.c @@ -31,6 +31,7 @@ #include /* pointer_t */ #include #include +#include #include #include #include diff --git a/kern/processor.c b/kern/processor.c index 3ece3412..19868609 100644 --- a/kern/processor.c +++ b/kern/processor.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include diff --git a/kern/server_loop.ch b/kern/server_loop.ch index 1aa7edbc..409e013d 100644 --- a/kern/server_loop.ch +++ b/kern/server_loop.ch @@ -39,6 +39,7 @@ */ #include +#include #include #include #include /* for kernel_map */ diff --git a/kern/thread.c b/kern/thread.c index f23af581..0a59f076 100644 --- a/kern/thread.c +++ b/kern/thread.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index 0c76d3d6..c7b38730 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -49,6 +49,8 @@ #include #include +#include + #include #include diff --git a/linux/dev/glue/net.c b/linux/dev/glue/net.c index 91ebf969..a60275fc 100644 --- a/linux/dev/glue/net.c +++ b/linux/dev/glue/net.c @@ -69,6 +69,7 @@ #include #include +#include #include #include diff --git a/vm/vm_map.c b/vm/vm_map.c index 5015c1cd..de10eecf 100644 --- a/vm/vm_map.c +++ b/vm/vm_map.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/block.c b/xen/block.c index 02d410fb..fb18b67e 100644 --- a/xen/block.c +++ b/xen/block.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include diff --git a/xen/net.c b/xen/net.c index 27898288..8373cec0 100644 --- a/xen/net.c +++ b/xen/net.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include diff --git a/xen/store.c b/xen/store.c index 94d0ae45..8796bb59 100644 --- a/xen/store.c +++ b/xen/store.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.3 From 264b750cc2d576beadfd74bcde45ac75edc4aab9 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 23 Mar 2012 02:19:44 +0100 Subject: Add missing phystokv/kvtophys calls * i386/i386/vm_param.h [!MACH_XEN]: Do not include . * i386/i386at/model_dep.c (init_alloc_aligned): Use phystokv to compare physical memory addresses with kernel start, end, and symbol table. * i386/intel/pmap.c (pmap_enter): Use kvtophys to convert ptp pointer to pte entry. * linux/dev/init/main.c (alloc_contig_mem, linux_init): Use phystokv to convert allocated pages to virtual pointer. * linux/src/include/asm-i386/io.h: Include . (virt_to_phys): Call _kvtophys. (phys_to_virt): Call phystokv. * linux/src/include/linux/compatmac.h: Include . (ioremap): Use phys_to_virt to convert physical address to virtual pointer. (my_iounmap): Likewise. * linux/dev/include/asm-i386/page.h: Include . (PAGE_SHIFT, PAGE_SIZE, PAGE_MASK): Remove macros. * linux/src/drivers/scsi/ncr53c8xx.c (vm_size_t): Remove type. * linux/dev/glue/net.c: Include (device_write): Call phystokv to convert from physical page address to virtual pointer. * linux/dev/glue/block.c (alloc_buffer, free_buffer, rdwr_full): Likewise. --- i386/i386/vm_param.h | 2 ++ i386/i386at/model_dep.c | 8 ++++---- i386/intel/pmap.c | 6 +++--- linux/dev/glue/block.c | 8 ++++---- linux/dev/glue/net.c | 7 ++++--- linux/dev/include/asm-i386/page.h | 7 +------ linux/dev/init/main.c | 4 ++-- linux/src/drivers/scsi/ncr53c8xx.c | 2 +- linux/src/include/asm-i386/io.h | 6 ++++-- linux/src/include/linux/compatmac.h | 5 +++-- 10 files changed, 28 insertions(+), 27 deletions(-) (limited to 'linux/dev/glue/net.c') diff --git a/i386/i386/vm_param.h b/i386/i386/vm_param.h index 6abbf8ff..49ba6631 100644 --- a/i386/i386/vm_param.h +++ b/i386/i386/vm_param.h @@ -25,7 +25,9 @@ /* XXX use xu/vm_param.h */ #include +#ifdef MACH_XEN #include +#endif /* The kernel address space is usually 1GB, usually starting at virtual address 0. */ #ifdef MACH_XEN diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index ef2d672a..01d515df 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -703,9 +703,9 @@ init_alloc_aligned(vm_size_t size, vm_offset_t *addrp) } /* Skip our own kernel code, data, and bss. */ - if ((avail_next > (vm_offset_t)start) && (addr < (vm_offset_t)end)) + if ((phystokv(avail_next) > (vm_offset_t)start) && (phystokv(addr) < (vm_offset_t)end)) { - avail_next = (vm_offset_t)end; + avail_next = _kvtophys(end); goto retry; } @@ -720,9 +720,9 @@ init_alloc_aligned(vm_size_t size, vm_offset_t *addrp) avail_next = mods_end_pa; goto retry; } - if ((avail_next > kern_sym_start) && (addr < kern_sym_end)) + if ((phystokv(avail_next) > kern_sym_start) && (phystokv(addr) < kern_sym_end)) { - avail_next = kern_sym_end; + avail_next = _kvtophys(kern_sym_end); goto retry; } if (boot_info.flags & MULTIBOOT_MODS) diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c index 51ca00eb..d8865b2f 100644 --- a/i386/intel/pmap.c +++ b/i386/intel/pmap.c @@ -1856,9 +1856,9 @@ Retry: | INTEL_PTE_WRITE)) panic("%s:%d could not set pde %p(%p,%p) to %p(%p,%p) %p\n",__FILE__,__LINE__, pdp, kvtophys((vm_offset_t)pdp), (vm_offset_t) pa_to_ma(kvtophys((vm_offset_t)pdp)), ptp, kvtophys(ptp), (vm_offset_t) pa_to_ma(kvtophys(ptp)), (vm_offset_t) pa_to_pte(kv_to_ma(ptp))); #else /* MACH_XEN */ - *pdp = pa_to_pte(ptp) | INTEL_PTE_VALID - | INTEL_PTE_USER - | INTEL_PTE_WRITE; + *pdp = pa_to_pte(kvtophys(ptp)) | INTEL_PTE_VALID + | INTEL_PTE_USER + | INTEL_PTE_WRITE; #endif /* MACH_XEN */ pdp++; ptp += INTEL_PGBYTES; diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c index c7b38730..63bc766b 100644 --- a/linux/dev/glue/block.c +++ b/linux/dev/glue/block.c @@ -307,7 +307,7 @@ alloc_buffer (int size) d = current_thread ()->pcb->data; assert (d); queue_enter (&d->pages, m, vm_page_t, pageq); - return (void *) m->phys_addr; + return (void *) phystokv(m->phys_addr); } return (void *) __get_free_pages (GFP_KERNEL, 0, ~0UL); } @@ -327,7 +327,7 @@ free_buffer (void *p, int size) assert (d); queue_iterate (&d->pages, m, vm_page_t, pageq) { - if (m->phys_addr == (vm_offset_t) p) + if (phystokv(m->phys_addr) == (vm_offset_t) p) { queue_remove (&d->pages, m, vm_page_t, pageq); VM_PAGE_FREE (m); @@ -600,9 +600,9 @@ rdwr_full (int rw, kdev_t dev, loff_t *off, char **buf, int *resid, int bshift) if (cc > ((nbuf - nb) << bshift)) cc = (nbuf - nb) << bshift; if (! test_bit (BH_Bounce, &bh->b_state)) - bh->b_data = (char *) pmap_extract (vm_map_pmap (device_io_map), + bh->b_data = (char *) phystokv(pmap_extract (vm_map_pmap (device_io_map), (((vm_offset_t) *buf) - + (nb << bshift))); + + (nb << bshift)))); else { bh->b_data = alloc_buffer (cc); diff --git a/linux/dev/glue/net.c b/linux/dev/glue/net.c index a60275fc..15732737 100644 --- a/linux/dev/glue/net.c +++ b/linux/dev/glue/net.c @@ -61,6 +61,7 @@ #include #include +#include #include #include @@ -449,7 +450,7 @@ device_write (void *d, ipc_port_t reply_port, assert (copy->cpy_npages == 1); skb->copy = copy; - skb->data = ((void *) copy->cpy_page_list[0]->phys_addr + skb->data = ((void *) phystokv(copy->cpy_page_list[0]->phys_addr) + (copy->offset & PAGE_MASK)); skb->len = count; skb->head = skb->data; @@ -463,7 +464,7 @@ device_write (void *d, ipc_port_t reply_port, skb->end = skb->tail; memcpy (skb->data, - ((void *) copy->cpy_page_list[0]->phys_addr + ((void *) phystokv(copy->cpy_page_list[0]->phys_addr) + (copy->offset & PAGE_MASK)), amt); count -= amt; @@ -473,7 +474,7 @@ device_write (void *d, ipc_port_t reply_port, amt = PAGE_SIZE; if (amt > count) amt = count; - memcpy (p, (void *) copy->cpy_page_list[i]->phys_addr, amt); + memcpy (p, (void *) phystokv(copy->cpy_page_list[i]->phys_addr), amt); count -= amt; p += amt; } diff --git a/linux/dev/include/asm-i386/page.h b/linux/dev/include/asm-i386/page.h index 2bb6837e..be818481 100644 --- a/linux/dev/include/asm-i386/page.h +++ b/linux/dev/include/asm-i386/page.h @@ -1,12 +1,7 @@ #ifndef _I386_PAGE_H #define _I386_PAGE_H -#ifndef MACH_INCLUDE -/* PAGE_SHIFT determines the page size */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) -#endif +#include #ifdef __KERNEL__ diff --git a/linux/dev/init/main.c b/linux/dev/init/main.c index f5c4832f..ecbd0b68 100644 --- a/linux/dev/init/main.c +++ b/linux/dev/init/main.c @@ -149,7 +149,7 @@ linux_init (void) /* * Free unused memory. */ - while (pages && pages->phys_addr < round_page (memory_start)) + while (pages && phystokv(pages->phys_addr) < round_page (memory_start)) pages = (vm_page_t) pages->pageq.next; if (pages) free_contig_mem (pages); @@ -296,7 +296,7 @@ alloc_contig_mem (unsigned size, unsigned limit, kfree ((vm_offset_t) bits, bits_len); if (pages) *pages = page_list; - return (m); + return phystokv(m); } /* diff --git a/linux/src/drivers/scsi/ncr53c8xx.c b/linux/src/drivers/scsi/ncr53c8xx.c index 1be3d9fe..22aec32b 100644 --- a/linux/src/drivers/scsi/ncr53c8xx.c +++ b/linux/src/drivers/scsi/ncr53c8xx.c @@ -273,7 +273,7 @@ typedef u32 u_int32; #define u_long unsigned long typedef u_long vm_offset_t; -typedef int vm_size_t; +//typedef int vm_size_t; #define bcopy(s, d, n) memcpy((d), (s), (n)) #define bzero(d, n) memset((d), 0, (n)) diff --git a/linux/src/include/asm-i386/io.h b/linux/src/include/asm-i386/io.h index 98e32ce6..f961f1d2 100644 --- a/linux/src/include/asm-i386/io.h +++ b/linux/src/include/asm-i386/io.h @@ -25,6 +25,8 @@ * Linus */ +#include + #ifdef SLOW_IO_BY_JUMPING #define __SLOW_DOWN_IO __asm__ __volatile__("jmp 1f\n1:\tjmp 1f\n1:") #else @@ -45,12 +47,12 @@ */ extern inline unsigned long virt_to_phys(volatile void * address) { - return (unsigned long) address; + return (unsigned long) _kvtophys(address); } extern inline void * phys_to_virt(unsigned long address) { - return (void *) address; + return (void *) phystokv(address); } /* diff --git a/linux/src/include/linux/compatmac.h b/linux/src/include/linux/compatmac.h index b9a41127..95370702 100644 --- a/linux/src/include/linux/compatmac.h +++ b/linux/src/include/linux/compatmac.h @@ -47,6 +47,7 @@ #define COMPATMAC_H #include +#include #if LINUX_VERSION_CODE < 0x020100 /* Less than 2.1.0 */ #define TWO_ZERO @@ -96,11 +97,11 @@ static inline unsigned char get_irq (unsigned char bus, unsigned char fn) static inline void *ioremap(unsigned long base, long length) { - if (base < 0x100000) return (void *)base; + if (base < 0x100000) return phys_to_virt(base); return vremap (base, length); } -#define my_iounmap(x, b) (((long)x<0x100000)?0:vfree ((void*)x)) +#define my_iounmap(x, b) (((long)x<(long)phys_to_virt(0x100000))?0:vfree ((void*)x)) #define capable(x) suser() -- cgit v1.2.3