Merge/sync with i386: various cosmetic tweaks

This commit is contained in:
Peter Wemm 2006-03-14 00:01:56 +00:00
parent cfa7ffb1d7
commit 8d0593f54e
3 changed files with 13 additions and 2 deletions

View file

@ -130,7 +130,7 @@
#ifdef LOCORE
/*
* Convenience macros for declaring interrupt entry points.
* Convenience macro for declaring interrupt entry points.
*/
#define IDTVEC(name) ALIGN_TEXT; .globl __CONCAT(X,name); \
.type __CONCAT(X,name),@function; __CONCAT(X,name):

View file

@ -1004,6 +1004,17 @@ bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused,
#endif
}
#ifdef BUS_SPACE_NO_LEGACY
#undef inb
#undef outb
#define inb(a) compiler_error
#define inw(a) compiler_error
#define inl(a) compiler_error
#define outb(a, b) compiler_error
#define outw(a, b) compiler_error
#define outl(a, b) compiler_error
#endif
#include <machine/bus_dma.h>
/*

View file

@ -176,7 +176,7 @@ extern u_int64_t KPML4phys; /* physical address of kernel level 4 */
* the corresponding pde that in turn maps it.
*/
pt_entry_t *vtopte(vm_offset_t);
#define vtophys(va) pmap_kextract((vm_offset_t)(va))
#define vtophys(va) pmap_kextract(((vm_offset_t) (va)))
static __inline pt_entry_t
pte_load(pt_entry_t *ptep)