Index: sys/amd64/include/atomic.h =================================================================== --- sys/amd64/include/atomic.h +++ sys/amd64/include/atomic.h @@ -124,8 +124,7 @@ : "+m" (*p) \ : CONS (V) \ : "memory", "cc"); \ -} \ -struct __hack +} /* * Atomic compare and set, used by the mutex functions Index: sys/amd64/vmm/vmm_instruction_emul.c =================================================================== --- sys/amd64/vmm/vmm_instruction_emul.c +++ sys/amd64/vmm/vmm_instruction_emul.c @@ -376,7 +376,7 @@ __asm __volatile("sub %2,%1; pushfq; popq %0" : \ "=r" (rflags), "+r" (x) : "m" (y)); \ return (rflags); \ -} struct __hack +} GETCC(8); GETCC(16); @@ -478,7 +478,7 @@ /* * MOV from AX/EAX/RAX to seg:moffset * A3: mov moffs16, AX - * A3: mov moffs32, EAX + * A3: mov moffs32, EAX * REX.W + A3: mov moffs64, RAX */ error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RAX, &val); @@ -1156,7 +1156,7 @@ case 0x2B: /* * SUB r/m from r and store the result in r - * + * * 2B/r SUB r16, r/m16 * 2B/r SUB r32, r/m32 * REX.W + 2B/r SUB r64, r/m64 @@ -1551,7 +1551,7 @@ if (SEG_DESC_UNUSABLE(desc->access)) return (-1); - /* + /* * The processor generates a #NP exception when a segment * register is loaded with a selector that points to a * descriptor that is not present. If this was the case then Index: sys/compat/linux/linux_util.h =================================================================== --- sys/compat/linux/linux_util.h +++ sys/compat/linux/linux_util.h @@ -91,8 +91,7 @@ \ LIN_SDT_PROBE1(dummy, s, return, ENOSYS); \ return (ENOSYS); \ -} \ -struct __hack +} void linux_msg(const struct thread *td, const char *fmt, ...) __printflike(2, 3); Index: sys/compat/linux/linux_vdso.h =================================================================== --- sys/compat/linux/linux_vdso.h +++ sys/compat/linux/linux_vdso.h @@ -59,7 +59,6 @@ .ptr = (uintptr_t *)&name \ }; \ SYSINIT(__elfN(name ## _sym_init), SI_SUB_EXEC, \ - SI_ORDER_FIRST, __elfN(linux_vdso_sym_init), &name ## sym); \ -struct __hack + SI_ORDER_FIRST, __elfN(linux_vdso_sym_init), &name ## sym) #endif /* _LINUX_VDSO_H_ */ Index: sys/i386/include/atomic.h =================================================================== --- sys/i386/include/atomic.h +++ sys/i386/include/atomic.h @@ -131,8 +131,7 @@ : "+m" (*p) \ : CONS (V) \ : "memory", "cc"); \ -} \ -struct __hack +} /* * Atomic compare and set, used by the mutex functions Index: sys/mips/include/cpufunc.h =================================================================== --- sys/mips/include/cpufunc.h +++ sys/mips/include/cpufunc.h @@ -62,9 +62,9 @@ #include #include -/* +/* * These functions are required by user-land atomi ops - */ + */ static __inline void mips_barrier(void) @@ -100,7 +100,7 @@ "syncw\n\t" ".set reorder\n" : : : "memory"); -#else +#else __asm __volatile ("sync" : : : "memory"); mips_barrier(); #endif @@ -133,7 +133,7 @@ : \ : [a0] "r"(a0)); \ mips_barrier(); \ -} struct __hack +} #define MIPS_RW64_COP0_SEL(n,r,s) \ static __inline uint64_t \ @@ -153,7 +153,7 @@ : \ : [a0] "r"(a0)); \ mips_barrier(); \ -} struct __hack +} #if defined(__mips_n64) MIPS_RW64_COP0(excpc, MIPS_COP_0_EXC_PC); @@ -197,7 +197,7 @@ : \ : [a0] "r"(a0)); \ mips_barrier(); \ -} struct __hack +} #define MIPS_RW32_COP0_SEL(n,r,s) \ static __inline uint32_t \ @@ -219,7 +219,7 @@ : \ : [a0] "r"(a0)); \ mips_barrier(); \ -} struct __hack +} #ifdef CPU_CNMIPS static __inline void mips_sync_icache (void) @@ -362,7 +362,7 @@ #if defined(__GNUC__) && !defined(__mips_o32) #define readq(a) (*(volatile uint64_t *)(a)) #endif - + #define writeb(va, d) (*(volatile uint8_t *) (va) = (d)) #define writew(va, d) (*(volatile uint16_t *) (va) = (d)) #define writel(va, d) (*(volatile uint32_t *) (va) = (d)) Index: sys/mips/nlm/dev/net/ucore/ucore.h =================================================================== --- sys/mips/nlm/dev/net/ucore/ucore.h +++ sys/mips/nlm/dev/net/ucore/ucore.h @@ -96,7 +96,7 @@ nlm_write_ucore_##name(unsigned int v) \ { \ nlm_write_ucore_reg(reg, v); \ -} struct __hack +} NLM_DEFINE_UCORE(obufdone, UCORE_OUTBUF_DONE); Index: sys/mips/nlm/hal/cop2.h =================================================================== --- sys/mips/nlm/hal/cop2.h +++ sys/mips/nlm/hal/cop2.h @@ -76,7 +76,7 @@ "mtc2 %0, $%1, %2\n" \ ".set pop\n" \ : : "r" (val), "i" (reg), "i" (sel)); \ -} struct __hack +} #if (__mips == 64) #define NLM_DEFINE_COP2_ACCESSORS64(name, reg, sel) \ @@ -103,7 +103,7 @@ "dmtc2 %0, $%1, %2\n" \ ".set pop\n" \ : : "r" (val), "i" (reg), "i" (sel)); \ -} struct __hack +} #else @@ -142,7 +142,7 @@ ".set pop\n" \ : : "r"(__high), "r"(__low), "i"(reg), "i"(sel) \ : "$8", "$9"); \ -} struct __hack +} #endif Index: sys/mips/sentry5/s5reg.h =================================================================== --- sys/mips/sentry5/s5reg.h +++ sys/mips/sentry5/s5reg.h @@ -34,7 +34,7 @@ : \ : [a0] "r"(a0)); \ /*mips_barrier();*/ \ -} struct __hack +} /* * All 5 of these sub-registers are used by Linux. Index: sys/sys/eventhandler.h =================================================================== --- sys/sys/eventhandler.h +++ sys/sys/eventhandler.h @@ -109,8 +109,8 @@ { \ struct eventhandler_entry ee; \ type eh_func; \ -}; \ -struct __hack +} + #define EVENTHANDLER_DEFINE(name, func, arg, priority) \ static eventhandler_tag name ## _tag; \ @@ -120,8 +120,8 @@ priority); \ } \ SYSINIT(name ## _evh_init, SI_SUB_CONFIGURE, SI_ORDER_ANY, \ - name ## _evh_init, arg); \ - struct __hack + name ## _evh_init, arg); + #define EVENTHANDLER_INVOKE(name, ...) \ do { \ @@ -141,9 +141,9 @@ if ((_el = eventhandler_find_list(#name)) != NULL) \ eventhandler_deregister(_el, tag); \ } while(0) - -eventhandler_tag eventhandler_register(struct eventhandler_list *list, + +eventhandler_tag eventhandler_register(struct eventhandler_list *list, const char *name, void *func, void *arg, int priority); void eventhandler_deregister(struct eventhandler_list *list, eventhandler_tag tag); Index: sys/sys/module.h =================================================================== --- sys/sys/module.h +++ sys/sys/module.h @@ -131,8 +131,7 @@ MODULE_DEPEND(name, kernel, __FreeBSD_version, \ __FreeBSD_version, maxver); \ MODULE_METADATA(_md_##name, MDT_MODULE, &data, #name); \ - SYSINIT(name##module, sub, order, module_register_init, &data); \ - struct __hack + SYSINIT(name##module, sub, order, module_register_init, &data); #define DECLARE_MODULE(name, data, sub, order) \ DECLARE_MODULE_WITH_MAXVER(name, data, sub, order, MODULE_KERNEL_MAXVER) Index: sys/sys/taskqueue.h =================================================================== --- sys/sys/taskqueue.h +++ sys/sys/taskqueue.h @@ -144,9 +144,9 @@ } \ \ SYSINIT(taskqueue_##name, SI_SUB_CONFIGURE, SI_ORDER_SECOND, \ - taskqueue_define_##name, NULL); \ - \ -struct __hack + taskqueue_define_##name, NULL); + + #define TASKQUEUE_DEFINE_THREAD(name) \ TASKQUEUE_DEFINE(name, taskqueue_thread_enqueue, &taskqueue_##name, \ taskqueue_start_threads(&taskqueue_##name, 1, PWAIT, \ @@ -169,9 +169,9 @@ } \ \ SYSINIT(taskqueue_##name, SI_SUB_CONFIGURE, SI_ORDER_SECOND, \ - taskqueue_define_##name, NULL); \ - \ -struct __hack + taskqueue_define_##name, NULL); + + #define TASKQUEUE_FAST_DEFINE_THREAD(name) \ TASKQUEUE_FAST_DEFINE(name, taskqueue_thread_enqueue, \ &taskqueue_##name, taskqueue_start_threads(&taskqueue_##name \ Index: usr.bin/uname/uname.c =================================================================== --- usr.bin/uname/uname.c +++ usr.bin/uname/uname.c @@ -225,7 +225,7 @@ #define NATIVE_SET \ *varp = buf; \ return; \ -} struct __hack +} #define NATIVE_BUFFER (buf) #define NATIVE_LENGTH (len)