diff options
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/include/cpufunc.h | 4 | ||||
-rw-r--r-- | sys/amd64/include/md_var.h | 9 | ||||
-rw-r--r-- | sys/amd64/include/segments.h | 14 | ||||
-rw-r--r-- | sys/amd64/include/smp.h | 92 |
4 files changed, 58 insertions, 61 deletions
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index 6bc01fa..ed1da94 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -236,8 +236,8 @@ invd(void) * (this is a bug) and the inlining cost is prohibitive since the call * executes into the IPI transmission system. */ -void invlpg (u_int addr); -void invltlb (void); +void invlpg(u_int addr); +void invltlb(void); static __inline void cpu_invlpg(void *addr) diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index 4c91d13..b4db430 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -40,10 +40,8 @@ extern int Maxmem; extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ extern void (*bcopy_vector)(const void *from, void *to, size_t len); extern int busdma_swi_pending; -extern int (*copyin_vector)(const void *udaddr, void *kaddr, - size_t len); -extern int (*copyout_vector)(const void *kaddr, void *udaddr, - size_t len); +extern int (*copyin_vector)(const void *udaddr, void *kaddr, size_t len); +extern int (*copyout_vector)(const void *kaddr, void *udaddr, size_t len); extern u_int cpu_feature; extern u_int cpu_high; extern u_int cpu_id; @@ -88,8 +86,7 @@ int i586_copyout(const void *kaddr, void *udaddr, size_t len); void i686_pagezero(void *addr); int is_physical_memory(vm_offset_t addr); u_long kvtop(void *addr); -void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, - int selec); +void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec); void swi_vm(void *); void userconfig(void); int user_dbreg_trap(void); diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h index 3e47fa8..fb5f76c 100644 --- a/sys/amd64/include/segments.h +++ b/sys/amd64/include/segments.h @@ -247,13 +247,13 @@ extern struct soft_segment_descriptor gdt_segs[]; extern struct gate_descriptor *idt; extern union descriptor ldt[NLDT]; -void lgdt (struct region_descriptor *rdp); -void lidt (struct region_descriptor *rdp); -void lldt (u_short sel); -void sdtossd (struct segment_descriptor *sdp, - struct soft_segment_descriptor *ssdp); -void ssdtosd (struct soft_segment_descriptor *ssdp, - struct segment_descriptor *sdp); +void lgdt(struct region_descriptor *rdp); +void lidt(struct region_descriptor *rdp); +void lldt(u_short sel); +void sdtossd(struct segment_descriptor *sdp, + struct soft_segment_descriptor *ssdp); +void ssdtosd(struct soft_segment_descriptor *ssdp, + struct segment_descriptor *sdp); #endif /* _KERNEL */ #endif /* !_MACHINE_SEGMENTS_H_ */ diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h index 3a57c00..872c5ec 100644 --- a/sys/amd64/include/smp.h +++ b/sys/amd64/include/smp.h @@ -61,7 +61,7 @@ extern int current_postcode; /** XXX currently in mp_machdep.c */ extern int bootMP_size; /* functions in mpboot.s */ -void bootMP (void); +void bootMP(void); /* global data in mp_machdep.c */ extern int bsp_apic_ready; @@ -88,36 +88,36 @@ extern struct apic_intmapinfo int_to_apicintpin[]; extern struct pcb stoppcbs[]; /* functions in mp_machdep.c */ -void i386_mp_probe (void); -u_int mp_bootaddress (u_int); -u_int isa_apic_mask (u_int); -int isa_apic_irq (int); -int pci_apic_irq (int, int, int); -int apic_irq (int, int); -int next_apic_irq (int); -int undirect_isa_irq (int); -int undirect_pci_irq (int); -int apic_bus_type (int); -int apic_src_bus_id (int, int); -int apic_src_bus_irq (int, int); -int apic_int_type (int, int); -int apic_trigger (int, int); -int apic_polarity (int, int); -void assign_apic_irq (int apic, int intpin, int irq); -void revoke_apic_irq (int irq); -void bsp_apic_configure (void); -void init_secondary (void); -void smp_invltlb (void); -void forward_statclock (void); -void forwarded_statclock (struct trapframe frame); -void forward_hardclock (void); -void forwarded_hardclock (struct trapframe frame); -void ipi_selected (u_int cpus, u_int ipi); -void ipi_all (u_int ipi); -void ipi_all_but_self (u_int ipi); -void ipi_self (u_int ipi); +void i386_mp_probe(void); +u_int mp_bootaddress(u_int); +u_int isa_apic_mask(u_int); +int isa_apic_irq(int); +int pci_apic_irq(int, int, int); +int apic_irq(int, int); +int next_apic_irq(int); +int undirect_isa_irq(int); +int undirect_pci_irq(int); +int apic_bus_type(int); +int apic_src_bus_id(int, int); +int apic_src_bus_irq(int, int); +int apic_int_type(int, int); +int apic_trigger(int, int); +int apic_polarity(int, int); +void assign_apic_irq(int apic, int intpin, int irq); +void revoke_apic_irq(int irq); +void bsp_apic_configure(void); +void init_secondary(void); +void smp_invltlb(void); +void forward_statclock(void); +void forwarded_statclock(struct trapframe frame); +void forward_hardclock(void); +void forwarded_hardclock(struct trapframe frame); +void ipi_selected(u_int cpus, u_int ipi); +void ipi_all(u_int ipi); +void ipi_all_but_self(u_int ipi); +void ipi_self(u_int ipi); #ifdef APIC_INTR_REORDER -void set_lapic_isrloc (int, int); +void set_lapic_isrloc(int, int); #endif /* APIC_INTR_REORDER */ /* global data in mpapic.c */ @@ -125,22 +125,22 @@ extern volatile lapic_t lapic; extern volatile ioapic_t **ioapic; /* functions in mpapic.c */ -void apic_dump (char*); -void apic_initialize (void); -void imen_dump (void); -int apic_ipi (int, int, int); -int selected_apic_ipi (u_int, int, int); -int io_apic_setup (int); -void io_apic_setup_intpin (int, int); -void io_apic_set_id (int, int); -int io_apic_get_id (int); -int ext_int_setup (int, int); - -void set_apic_timer (int); -int read_apic_timer (void); -void u_sleep (int); -u_int io_apic_read (int, int); -void io_apic_write (int, int, u_int); +void apic_dump(char*); +void apic_initialize(void); +void imen_dump(void); +int apic_ipi(int, int, int); +int selected_apic_ipi(u_int, int, int); +int io_apic_setup(int); +void io_apic_setup_intpin(int, int); +void io_apic_set_id(int, int); +int io_apic_get_id(int); +int ext_int_setup(int, int); + +void set_apic_timer(int); +int read_apic_timer(void); +void u_sleep(int); +u_int io_apic_read(int, int); +void io_apic_write(int, int, u_int); #endif /* !LOCORE */ #endif /* SMP && !APIC_IO */ |