diff options
Diffstat (limited to 'sys/i386/include')
| -rw-r--r-- | sys/i386/include/apic.h | 4 | ||||
| -rw-r--r-- | sys/i386/include/apicreg.h | 4 | ||||
| -rw-r--r-- | sys/i386/include/asmacros.h | 1 | ||||
| -rw-r--r-- | sys/i386/include/asnames.h | 324 |
4 files changed, 4 insertions, 329 deletions
diff --git a/sys/i386/include/apic.h b/sys/i386/include/apic.h index 3d84792..8e7a3b0 100644 --- a/sys/i386/include/apic.h +++ b/sys/i386/include/apic.h @@ -470,8 +470,8 @@ typedef struct IOAPIC ioapic_t; /* * Protects the IO APIC and apic_imen as a critical region. */ -#define IMASK_LOCK MTX_LOCK_SPIN(_imen_mtx, 0) -#define IMASK_UNLOCK MTX_UNLOCK_SPIN(_imen_mtx) +#define IMASK_LOCK MTX_LOCK_SPIN(imen_mtx, 0) +#define IMASK_UNLOCK MTX_UNLOCK_SPIN(imen_mtx) #else /* SMP */ diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h index 3d84792..8e7a3b0 100644 --- a/sys/i386/include/apicreg.h +++ b/sys/i386/include/apicreg.h @@ -470,8 +470,8 @@ typedef struct IOAPIC ioapic_t; /* * Protects the IO APIC and apic_imen as a critical region. */ -#define IMASK_LOCK MTX_LOCK_SPIN(_imen_mtx, 0) -#define IMASK_UNLOCK MTX_UNLOCK_SPIN(_imen_mtx) +#define IMASK_LOCK MTX_LOCK_SPIN(imen_mtx, 0) +#define IMASK_UNLOCK MTX_UNLOCK_SPIN(imen_mtx) #else /* SMP */ diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h index 0931404..c4f9e0d 100644 --- a/sys/i386/include/asmacros.h +++ b/sys/i386/include/asmacros.h @@ -37,7 +37,6 @@ #define _MACHINE_ASMACROS_H_ #include <sys/cdefs.h> -#include <machine/asnames.h> /* XXX too much duplication in various asm*.h's. */ diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h deleted file mode 100644 index cd75f50..0000000 --- a/sys/i386/include/asnames.h +++ /dev/null @@ -1,324 +0,0 @@ -/*- - * Copyright (c) 1997 John D. Polstra - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_ASNAMES_H_ -#define _MACHINE_ASNAMES_H_ - -/* - * This file is used by the kernel assembly language sources to provide - * the proper mapping between the global names used in assembly language - * code and the corresponding C symbols. By convention, all C symbols - * that are referenced from assembly language are prefixed with `_'. - * That happens to be the same prefix that the a.out compiler attaches - * to each C symbol. - * - * When using the ELF compiler, C symbols are identical to the corresponding - * assembly language symbols. Thus the extra underscores cause problems. - * The defines in this file map the underscore names back to the proper - * unadorned names. - * - * Every global symbol that is referenced from both C source and assembly - * language source must have an entry in this file, or the kernel will - * not build properly using the ELF compiler. - * - * This file is included by <machine/asmacros.h>, and it is OK to rely - * on that. - */ - -#ifdef __ELF__ - -#define _APTD APTD -#define _APTDpde APTDpde -#define _APTmap APTmap -#define _CONST_QNaN CONST_QNaN -#define _IdlePTD IdlePTD -#define _KPTphys KPTphys -#define _MP_GDT MP_GDT -#define _PTD PTD -#define _PTDpde PTDpde -#define _PTmap PTmap -#define _SMP_prvspace SMP_prvspace -#define _SMPpt SMPpt -#define _Xalign Xalign -#define _Xbnd Xbnd -#define _Xbpt Xbpt -#define _Xcpuast Xcpuast -#define _Xcpucheckstate Xcpucheckstate -#define _Xcpustop Xcpustop -#define _Xdbg Xdbg -#define _Xdiv Xdiv -#define _Xdna Xdna -#define _Xfastintr0 Xfastintr0 -#define _Xfastintr1 Xfastintr1 -#define _Xfastintr10 Xfastintr10 -#define _Xfastintr11 Xfastintr11 -#define _Xfastintr12 Xfastintr12 -#define _Xfastintr13 Xfastintr13 -#define _Xfastintr14 Xfastintr14 -#define _Xfastintr15 Xfastintr15 -#define _Xfastintr16 Xfastintr16 -#define _Xfastintr17 Xfastintr17 -#define _Xfastintr18 Xfastintr18 -#define _Xfastintr19 Xfastintr19 -#define _Xfastintr2 Xfastintr2 -#define _Xfastintr20 Xfastintr20 -#define _Xfastintr21 Xfastintr21 -#define _Xfastintr22 Xfastintr22 -#define _Xfastintr23 Xfastintr23 -#define _Xfastintr24 Xfastintr24 -#define _Xfastintr25 Xfastintr25 -#define _Xfastintr26 Xfastintr26 -#define _Xfastintr27 Xfastintr27 -#define _Xfastintr28 Xfastintr28 -#define _Xfastintr29 Xfastintr29 -#define _Xfastintr3 Xfastintr3 -#define _Xfastintr30 Xfastintr30 -#define _Xfastintr31 Xfastintr31 -#define _Xfastintr4 Xfastintr4 -#define _Xfastintr5 Xfastintr5 -#define _Xfastintr6 Xfastintr6 -#define _Xfastintr7 Xfastintr7 -#define _Xfastintr8 Xfastintr8 -#define _Xfastintr9 Xfastintr9 -#define _Xfpu Xfpu -#define _Xfpusegm Xfpusegm -#define _Xill Xill -#define _Xint0x80_syscall Xint0x80_syscall -#define _Xintr0 Xintr0 -#define _Xintr1 Xintr1 -#define _Xintr10 Xintr10 -#define _Xintr11 Xintr11 -#define _Xintr12 Xintr12 -#define _Xintr13 Xintr13 -#define _Xintr14 Xintr14 -#define _Xintr15 Xintr15 -#define _Xintr16 Xintr16 -#define _Xintr17 Xintr17 -#define _Xintr18 Xintr18 -#define _Xintr19 Xintr19 -#define _Xintr2 Xintr2 -#define _Xintr20 Xintr20 -#define _Xintr21 Xintr21 -#define _Xintr22 Xintr22 -#define _Xintr23 Xintr23 -#define _Xintr24 Xintr24 -#define _Xintr25 Xintr25 -#define _Xintr26 Xintr26 -#define _Xintr27 Xintr27 -#define _Xintr28 Xintr28 -#define _Xintr29 Xintr29 -#define _Xintr3 Xintr3 -#define _Xintr30 Xintr30 -#define _Xintr31 Xintr31 -#define _Xintr4 Xintr4 -#define _Xintr5 Xintr5 -#define _Xintr6 Xintr6 -#define _Xintr7 Xintr7 -#define _Xintr8 Xintr8 -#define _Xintr9 Xintr9 -#define _Xtintr0 Xtintr0 -#define _Xinvltlb Xinvltlb -#define _Xrendezvous Xrendezvous -#define _Xmchk Xmchk -#define _Xmissing Xmissing -#define _Xnmi Xnmi -#define _Xofl Xofl -#define _Xpage Xpage -#define _Xprot Xprot -#define _Xrsvd Xrsvd -#define _Xspuriousint Xspuriousint -#define _Xstk Xstk -#define _Xlcall_syscall Xlcall_syscall -#define _Xtss Xtss -#define __default_ldt _default_ldt -#define __ucodesel _ucodesel -#define __udatasel _udatasel -#define _alltraps alltraps -#define _ap_init ap_init -#define _apic_imen apic_imen -#define _apic_isrbit_location apic_isrbit_location -#define _apic_pin_trigger apic_pin_trigger -#define _arith_invalid arith_invalid -#define _arith_overflow arith_overflow -#define _arith_underflow arith_underflow -#define _ast ast -#define _bcopy bcopy -#define _bcopy_vector bcopy_vector -#define _bigJump bigJump -#define _bintr bintr -#define _bioscall_vector bioscall_vector -#define _bootCodeSeg bootCodeSeg -#define _bootDataSeg bootDataSeg -#define _bootMP bootMP -#define _bootMP_size bootMP_size -#define _bootSTK bootSTK -#define _boot_get_mplock boot_get_mplock -#define _bootdev bootdev -#define _boothowto boothowto -#define _bootinfo bootinfo -#define _btrap btrap -#define _bzero bzero -#define _checkstate_cpus checkstate_cpus -#define _checkstate_cpustate checkstate_cpustate -#define _checkstate_curproc checkstate_curproc -#define _checkstate_need_ast checkstate_need_ast -#define _checkstate_pc checkstate_pc -#define _checkstate_pending_ast checkstate_pending_ast -#define _checkstate_probed_cpus checkstate_probed_cpus -#define _chooseproc chooseproc -#define _cnt cnt -#define _copyin_vector copyin_vector -#define _copyout_vector copyout_vector -#define _cpu cpu -#define _cpu0prvpage cpu0prvpage -#define _cpu_apic_versions cpu_apic_versions -#define _cpu_class cpu_class -#define _cpu_feature cpu_feature -#define _cpu_high cpu_high -#define _cpu_id cpu_id -#define _cpu_num_to_apic_id cpu_num_to_apic_id -#define _cpu_switch cpu_switch -#define _cpu_vendor cpu_vendor -#define _default_halt default_halt -#define _denormal_operand denormal_operand -#define _div_small div_small -#define _divide_by_zero divide_by_zero -#define _divide_kernel divide_kernel -#define _do_page_zero_idle do_page_zero_idle -#define _doreti doreti -#define _edata edata -#define _eintrcnt eintrcnt -#define _eintrnames eintrnames -#define _end end -#define _etext etext -#define _exception exception -#define _fastmove fastmove -#define _fork_exit fork_exit -#define _gdt gdt -#define _generic_bcopy generic_bcopy -#define _generic_bzero generic_bzero -#define _generic_copyin generic_copyin -#define _generic_copyout generic_copyout -#define _get_align_lock get_align_lock -#define _get_altsyscall_lock get_altsyscall_lock -#define _get_fpu_lock get_fpu_lock -#define _get_isrlock get_isrlock -#define _get_mplock get_mplock -#define _get_syscall_lock get_syscall_lock -#define _Giant Giant -#define _idle idle -#define _imen imen -#define _imen_mtx imen_mtx -#define _in_vm86call in_vm86call -#define _init386 init386 -#define _init_secondary init_secondary -#define _intr_countp intr_countp -#define _intr_handler intr_handler -#define _intr_mask intr_mask -#define _intr_unit intr_unit -#define _intrcnt intrcnt -#define _intrnames intrnames -#define _invltlb_ok invltlb_ok -#define _ioapic ioapic -#define _isr_lock isr_lock -#define _kernelname kernelname -#define _lapic lapic -#define _linux_sigcode linux_sigcode -#define _linux_szsigcode linux_szsigcode -#define _mi_startup mi_startup -#define _microuptime microuptime -#define _mp_gdtbase mp_gdtbase -#define _mp_lock mp_lock -#define _mp_ncpus mp_ncpus -#define _mul64 mul64 -#define _nfs_diskless nfs_diskless -#define _nfs_diskless_valid nfs_diskless_valid -#define _normalize normalize -#define _normalize_nuo normalize_nuo -#define _npx_intr npx_intr -#define _npxsave npxsave -#define _szosigcode szosigcode -#define _ovbcopy_vector ovbcopy_vector -#define _panic panic -#define _pc98_system_parameter pc98_system_parameter -#define _poly_div16 poly_div16 -#define _poly_div2 poly_div2 -#define _poly_div4 poly_div4 -#define _polynomial polynomial -#define _private_tss private_tss -#define _proc0 proc0 -#define _proc0paddr proc0paddr -#define _procrunnable procrunnable -#define _real_2op_NaN real_2op_NaN -#define _reg_div reg_div -#define _reg_u_add reg_u_add -#define _reg_u_div reg_u_div -#define _reg_u_mul reg_u_mul -#define _reg_u_sub reg_u_sub -#define _rel_mplock rel_mplock -#define _round_reg round_reg -#define _sched_ithd sched_ithd -#define _sched_lock sched_lock -#define _set_precision_flag_down set_precision_flag_down -#define _set_precision_flag_up set_precision_flag_up -#define _set_user_ldt set_user_ldt -#define _shrx shrx -#define _shrxs shrxs -#define _sigcode sigcode -#define _smp_active smp_active -#define _smp_rendezvous_action smp_rendezvous_action -#define _softclock softclock -#define _spending spending -#define _started_cpus started_cpus -#define _stopped_cpus stopped_cpus -#define _svr4_sigcode svr4_sigcode -#define _svr4_sys_context svr4_sys_context -#define _svr4_szsigcode svr4_szsigcode -#define _swi_dispatcher swi_dispatcher -#define _swi_generic swi_generic -#define _swi_net swi_net -#define _swi_null swi_null -#define _swi_vm swi_vm -#define _syscall syscall -#define _szsigcode szsigcode -#define _ticks ticks -#define _time time -#define _trap trap -#define _trapwrite trapwrite -#define _vec vec -#define _vec8254 vec8254 -#define _vm86_prepcall vm86_prepcall -#define _vm86pa vm86pa -#define _vm86paddr vm86paddr -#define _vm86pcb vm86pcb -#define _vm_page_zero_idle vm_page_zero_idle -#define _wm_sqrt wm_sqrt - -#endif /* __ELF__ */ - -#endif /* !_MACHINE_ASNAMES_H_ */ |
