diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2006-03-14 00:01:56 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2006-03-14 00:01:56 +0000 |
| commit | 8d0593f54e62cfd8d52f4d46328568dea5a4c196 (patch) | |
| tree | 0bf6083ad05c3a68a7c320e27cdb54b7456321f6 /sys/amd64 | |
| parent | cfa7ffb1d7aadf6eb845829f5ded99104d17edf3 (diff) | |
| download | src-8d0593f54e62cfd8d52f4d46328568dea5a4c196.tar.gz src-8d0593f54e62cfd8d52f4d46328568dea5a4c196.zip | |
Merge/sync with i386: various cosmetic tweaks
Notes
Notes:
svn path=/head/; revision=156699
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/include/asmacros.h | 2 | ||||
| -rw-r--r-- | sys/amd64/include/bus.h | 11 | ||||
| -rw-r--r-- | sys/amd64/include/pmap.h | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h index 75d15ac51886..9c0f6559cdf4 100644 --- a/sys/amd64/include/asmacros.h +++ b/sys/amd64/include/asmacros.h @@ -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): diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h index b1a91a27b2d1..e25f427e3abf 100644 --- a/sys/amd64/include/bus.h +++ b/sys/amd64/include/bus.h @@ -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> /* diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index c4ca99a3b9f7..4af3b36d5d1f 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -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) |