kernel: Replace the remaining __amd64__ with __x86_64__ for consistency.

diff --git a/sys/dev/crypto/aesni/aesni.h b/sys/dev/crypto/aesni/aesni.h
index b3a7def..7aa5af2 100644 (file)
--- a/sys/dev/crypto/aesni/aesni.h
+++ b/sys/dev/crypto/aesni/aesni.h
@@ -35,7 +35,7 @@
 
 #include <opencrypto/cryptodev.h>
 
-#if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
+#if defined(__x86_64__) || defined(__i386__)
 #include <machine/cpufunc.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
@@ -43,7 +43,7 @@
 #endif
 #if defined(__i386__)
 #include <machine/npx.h>
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
 #include <machine/npx.h>
 #endif
 

diff --git a/sys/dev/netif/ixgbe/ixgbe_osdep.h b/sys/dev/netif/ixgbe/ixgbe_osdep.h
index ee5ab7e..283bfc8 100644 (file)
--- a/sys/dev/netif/ixgbe/ixgbe_osdep.h
+++ b/sys/dev/netif/ixgbe/ixgbe_osdep.h
@@ -124,13 +124,13 @@ typedef boolean_t bool;
 
 #define le16_to_cpu 
 
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__i386__) || defined(__x86_64__)
 #define wmb()  __asm volatile("sfence" ::: "memory")
 #else
 #define wmb()
 #endif
 
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__i386__) || defined(__x86_64__)
 static __inline
 void prefetch(void *x)
 {

diff --git a/sys/dev/raid/aac/aac.c b/sys/dev/raid/aac/aac.c
index b833dd3..3893c75 100644 (file)
--- a/sys/dev/raid/aac/aac.c
+++ b/sys/dev/raid/aac/aac.c
@@ -3149,7 +3149,7 @@ aac_ioctl_send_raw_srb(struct aac_softc *sc, caddr_t arg)
                srb_sg_bytecount = sge->SgByteCount;
                srb_sg_address = (void *)(uintptr_t)sge->SgAddress;
        }
-#ifdef __amd64__
+#ifdef __x86_64__
        else if (fibsize == (sizeof(struct aac_srb) +
            srbcmd->sg_map.SgCount * sizeof(struct aac_sg_entry64))) {
                sge = NULL;

diff --git a/sys/dev/raid/aac/aac_linux.c b/sys/dev/raid/aac/aac_linux.c
index 4dc3229..2f567fc 100644 (file)
--- a/sys/dev/raid/aac/aac_linux.c
+++ b/sys/dev/raid/aac/aac_linux.c
@@ -38,7 +38,7 @@
 #include <sys/file.h>
 #include <sys/mapped_ioctl.h>
 #include <sys/proc.h>
-#ifdef __amd64__
+#ifdef __x86_64__
 #include <machine/../linux32/linux.h>
 #include <machine/../linux32/linux32_proto.h>
 #else

diff --git a/sys/dev/raid/amr/amr_linux.c b/sys/dev/raid/amr/amr_linux.c
index 362a166..e43e5a0 100644 (file)
--- a/sys/dev/raid/amr/amr_linux.c
+++ b/sys/dev/raid/amr/amr_linux.c
@@ -34,7 +34,7 @@
 #include <sys/file.h>
 #include <sys/proc.h>
 
-#if defined(__amd64__) /* Assume amd64 wants 32 bit Linux */
+#if defined(__x86_64__) /* Assume amd64 wants 32 bit Linux */
 #include <machine/../linux32/linux.h>
 #include <machine/../linux32/linux32_proto.h>
 #else

diff --git a/sys/dev/raid/amr/amrio.h b/sys/dev/raid/amr/amrio.h
index 8849fe4..2a00ea2 100644 (file)
--- a/sys/dev/raid/amr/amrio.h
+++ b/sys/dev/raid/amr/amrio.h
@@ -108,7 +108,7 @@ struct amr_user_ioctl {
 
 #define AMR_IO_COMMAND _IOWR('A', 0x201, struct amr_user_ioctl)
 
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__x86_64__) || defined(__ia64__)
 
 struct amr_user_ioctl32 {
     unsigned char      au_cmd[32];     /* command text from userspace */

diff --git a/sys/dev/raid/ciss/ciss.c b/sys/dev/raid/ciss/ciss.c
index 1af90bf..a45d063 100644 (file)
--- a/sys/dev/raid/ciss/ciss.c
+++ b/sys/dev/raid/ciss/ciss.c
@@ -4497,7 +4497,7 @@ ciss_ioctl(struct dev_ioctl_args *ap)
     u_long cmd = ap->a_cmd;
     struct ciss_softc          *sc;
     IOCTL_Command_struct       *ioc    = (IOCTL_Command_struct *)addr;
-#ifdef __amd64__
+#ifdef __x86_64__
     IOCTL_Command_struct32     *ioc32  = (IOCTL_Command_struct32 *)addr;
     IOCTL_Command_struct       ioc_swab;
 #endif
@@ -4612,7 +4612,7 @@ ciss_ioctl(struct dev_ioctl_args *ap)
         */
        break;
 
-#ifdef __amd64__
+#ifdef __x86_64__
     case CCISS_PASSTHRU32:
        ioc_swab.LUN_info       = ioc32->LUN_info;
        ioc_swab.Request        = ioc32->Request;

diff --git a/sys/dev/raid/ciss/cissio.h b/sys/dev/raid/ciss/cissio.h
index 23fb399..6fd4439 100644 (file)
--- a/sys/dev/raid/ciss/cissio.h
+++ b/sys/dev/raid/ciss/cissio.h
@@ -184,7 +184,7 @@ typedef struct {
     u_int8_t           *buf;           /* 4 */
 } __packed IOCTL_Command_struct;
 
-#ifdef __amd64__
+#ifdef __x86_64__
 typedef struct {
     LUNAddr_struct     LUN_info;       /* 8 */
     RequestBlock_struct        Request;        /* 20 */

diff --git a/sys/emulation/linux/linux_epoll.h b/sys/emulation/linux/linux_epoll.h
index 37cd3eb..a5797ee 100644 (file)
--- a/sys/emulation/linux/linux_epoll.h
+++ b/sys/emulation/linux/linux_epoll.h
@@ -29,7 +29,7 @@
 #ifndef _LINUX_EPOLL_H_
 #define _LINUX_EPOLL_H_
 
-#ifdef __amd64__
+#ifdef __x86_64__
 #define EPOLL_PACKED    __packed
 #else
 #define EPOLL_PACKED

diff --git a/sys/emulation/ndis/kern_windrv.c b/sys/emulation/ndis/kern_windrv.c
index e95ab0f..620cfa0 100644 (file)
--- a/sys/emulation/ndis/kern_windrv.c
+++ b/sys/emulation/ndis/kern_windrv.c
@@ -313,7 +313,7 @@ windrv_unload(module_t mod, vm_offset_t img, int len)
 
 #define WINDRV_LOADED          htonl(0x42534F44)
 
-#ifdef __amd64__
+#ifdef __x86_64__
 static void
 patch_user_shared_data_address(vm_offset_t img, size_t len)
 {
@@ -378,7 +378,7 @@ windrv_load(module_t mod, vm_offset_t img, int len, interface_type bustype,
                        return (ENOEXEC);
        }
 
-#ifdef __amd64__
+#ifdef __x86_64__
        patch_user_shared_data_address(img, len);
 #endif
 

diff --git a/sys/emulation/ndis/ntoskrnl_var.h b/sys/emulation/ndis/ntoskrnl_var.h
index 81fac33..beaf90f 100644 (file)
--- a/sys/emulation/ndis/ntoskrnl_var.h
+++ b/sys/emulation/ndis/ntoskrnl_var.h
@@ -1394,7 +1394,7 @@ struct drvdb_ent {
 };
 
 extern image_patch_table ntoskrnl_functbl[];
-#ifdef __amd64__
+#ifdef __x86_64__
 extern struct kuser_shared_data kuser_shared_data;
 #endif
 typedef void (*funcptr)(void);

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index dee9e7d..683f2c2 100644 (file)
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -207,7 +207,7 @@ mi_startup(void)
 
        if (sysinit == NULL) {
                sysinit = SET_BEGIN(sysinit_set);
-#if defined(__amd64__) && defined(_KERNEL_VIRTUAL)
+#if defined(__x86_64__) && defined(_KERNEL_VIRTUAL)
                /*
                 * XXX For whatever reason, on 64-bit vkernels
                 * the value of sysinit obtained from the
@@ -220,7 +220,7 @@ mi_startup(void)
 #endif
                sysinit_end = SET_LIMIT(sysinit_set);
        }
-#if defined(__amd64__) && defined(_KERNEL_VIRTUAL)
+#if defined(__x86_64__) && defined(_KERNEL_VIRTUAL)
        KKASSERT((long)sysinit % 8 == 0);
 #endif
 

diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index efa552c..ba26320 100644 (file)
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -49,7 +49,7 @@
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
-#if defined(__amd64__) && defined(_KERNEL_VIRTUAL)
+#if defined(__x86_64__) && defined(_KERNEL_VIRTUAL)
 #include <stdio.h>
 #endif
 
@@ -164,7 +164,7 @@ link_elf_init(void* arg)
        if (linker_kernel_file == NULL)
            panic("link_elf_init: Can't create linker structures for kernel");
        parse_dynamic(linker_kernel_file);
-#if defined(__amd64__) && defined(_KERNEL_VIRTUAL)
+#if defined(__x86_64__) && defined(_KERNEL_VIRTUAL)
        fprintf(stderr, "WARNING: KERNBASE being used\n");
 #endif
        linker_kernel_file->address = (caddr_t) KERNBASE;

diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 60f47a4..136b2fa 100644 (file)
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -651,7 +651,7 @@ link_elf_obj_load_file(const char *filename, linker_file_t * result)
         *
         * vkernel64's text+data is outside the managed VM space entirely.
         */
-#if defined(__amd64__) && defined(_KERNEL_VIRTUAL)
+#if defined(__x86_64__) && defined(_KERNEL_VIRTUAL)
        error = vkernel_module_memory_alloc(&mapbase, round_page(mapsize));
 #else
        mapbase = KERNBASE;
@@ -889,7 +889,7 @@ link_elf_obj_unload_file(linker_file_t file)
                kfree(ef->progtab, M_LINKER);
 
        if (ef->object) {
-#if defined(__amd64__) && defined(_KERNEL_VIRTUAL)
+#if defined(__x86_64__) && defined(_KERNEL_VIRTUAL)
                vkernel_module_memory_free((vm_offset_t)ef->address, ef->bytes);
 #else
                vm_map_remove(&kernel_map, (vm_offset_t) ef->address,

diff --git a/sys/kern/lwkt_ipiq.c b/sys/kern/lwkt_ipiq.c
index 11b0374..911c208 100644 (file)
--- a/sys/kern/lwkt_ipiq.c
+++ b/sys/kern/lwkt_ipiq.c
@@ -658,7 +658,7 @@ lwkt_process_ipiq_core(globaldata_t sgd, lwkt_ipiq_t ip,
                        copy_func, copy_arg1, copy_arg2,
 #if defined(__i386__)
                        (frame ? (void *)frame->if_eip : NULL));
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
                        (frame ? (void *)frame->if_rip : NULL));
 #else
                        NULL);

diff --git a/sys/kern/lwkt_thread.c b/sys/kern/lwkt_thread.c
index 72ae639..b7979a0 100644 (file)
--- a/sys/kern/lwkt_thread.c
+++ b/sys/kern/lwkt_thread.c
@@ -765,7 +765,7 @@ skip:
            need_lwkt_resched();        /* prevent hlt */
            goto haveidle;
        }
-#if defined(INVARIANTS) && defined(__amd64__)
+#if defined(INVARIANTS) && defined(__x86_64__)
        if ((read_rflags() & PSL_I) == 0) {
                cpu_enable_intr();
                panic("lwkt_switch() called with interrupts disabled");

diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index 3c54e87..6898e68 100644 (file)
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -572,7 +572,7 @@ int vmspace_anonymous_count (struct vmspace *vmspace);
 void vm_map_set_wired_quick(vm_map_t map, vm_offset_t addr, vm_size_t size, int *);
 void vm_map_transition_wait(vm_map_t map);
 
-#if defined(__amd64__) && defined(_KERNEL_VIRTUAL)
+#if defined(__x86_64__) && defined(_KERNEL_VIRTUAL)
 int vkernel_module_memory_alloc(vm_offset_t *, size_t);
 void vkernel_module_memory_free(vm_offset_t, size_t);
 #endif