Module Name: src Committed By: msaitoh Date: Wed Aug 22 01:05:24 UTC 2018
Modified Files: src/distrib/sets/lists/comp: ad.m68k src/sys/arch/alpha/include: cpu.h src/sys/arch/amiga/include: cpu.h src/sys/arch/arm/include: cpu.h src/sys/arch/atari/include: cpu.h src/sys/arch/cesfic/include: cpu.h src/sys/arch/evbcf/include: cpu.h src/sys/arch/hp300/include: cpu.h src/sys/arch/hppa/include: cpu.h src/sys/arch/luna68k/include: cpu.h src/sys/arch/m68k/include: Makefile cpu.h src/sys/arch/mac68k/include: cpu.h src/sys/arch/mips/include: cpu.h src/sys/arch/mvme68k/include: cpu.h src/sys/arch/news68k/include: cpu.h src/sys/arch/powerpc/include: cpu.h src/sys/arch/sh3/include: cpu.h src/sys/arch/sparc/include: cpu.h src/sys/arch/sparc64/include: cpu.h src/sys/arch/vax/include: cpu.h src/sys/arch/x68k/include: cpu.h src/sys/arch/x86/include: cpu.h src/sys/compat/linux/common: linux_exec.h src/sys/compat/linux32/common: linux32_sysctl.h src/sys/fs/cd9660: cd9660_extern.h src/sys/kern: init_sysctl.c src/sys/net: if.h src/sys/netinet: dccp_var.h icmp6.h icmp_var.h in.h ip_carp.h pim_var.h sctp_var.h tcp_var.h udp_var.h src/sys/netinet6: in6.h pim6_var.h raw_ip6.h udp6_var.h src/sys/netipsec: ipsec_var.h src/sys/nfs: nfs.h src/sys/sys: mbuf.h mount.h pipe.h socket.h sysctl.h src/sys/ufs/ffs: ffs_extern.h src/sys/ufs/lfs: lfs_extern.h src/sys/uvm: uvm_param.h Removed Files: src/sys/arch/m68k/include: sysctl.h Log Message: - Cleanup for dynamic sysctl: - Remove unused *_NAMES macros for sysctl. - Remove unused *_MAXID for sysctls. - Move CTL_MACHDEP sysctl definitions for m68k into m68k/include/cpu.h and use them on all m68k machines. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.83 -r1.84 src/sys/arch/alpha/include/cpu.h cvs rdiff -u -r1.81 -r1.82 src/sys/arch/amiga/include/cpu.h cvs rdiff -u -r1.96 -r1.97 src/sys/arch/arm/include/cpu.h cvs rdiff -u -r1.70 -r1.71 src/sys/arch/atari/include/cpu.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/cesfic/include/cpu.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbcf/include/cpu.h cvs rdiff -u -r1.69 -r1.70 src/sys/arch/hp300/include/cpu.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/include/cpu.h cvs rdiff -u -r1.34 -r1.35 src/sys/arch/luna68k/include/cpu.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/m68k/include/Makefile cvs rdiff -u -r1.15 -r1.16 src/sys/arch/m68k/include/cpu.h cvs rdiff -u -r1.2 -r0 src/sys/arch/m68k/include/sysctl.h cvs rdiff -u -r1.99 -r1.100 src/sys/arch/mac68k/include/cpu.h cvs rdiff -u -r1.124 -r1.125 src/sys/arch/mips/include/cpu.h cvs rdiff -u -r1.49 -r1.50 src/sys/arch/mvme68k/include/cpu.h cvs rdiff -u -r1.43 -r1.44 src/sys/arch/news68k/include/cpu.h cvs rdiff -u -r1.107 -r1.108 src/sys/arch/powerpc/include/cpu.h cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sh3/include/cpu.h cvs rdiff -u -r1.100 -r1.101 src/sys/arch/sparc/include/cpu.h cvs rdiff -u -r1.124 -r1.125 src/sys/arch/sparc64/include/cpu.h cvs rdiff -u -r1.101 -r1.102 src/sys/arch/vax/include/cpu.h cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x68k/include/cpu.h cvs rdiff -u -r1.96 -r1.97 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.52 -r1.53 src/sys/compat/linux/common/linux_exec.h cvs rdiff -u -r1.3 -r1.4 src/sys/compat/linux32/common/linux32_sysctl.h cvs rdiff -u -r1.26 -r1.27 src/sys/fs/cd9660/cd9660_extern.h cvs rdiff -u -r1.214 -r1.215 src/sys/kern/init_sysctl.c cvs rdiff -u -r1.264 -r1.265 src/sys/net/if.h cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/dccp_var.h cvs rdiff -u -r1.51 -r1.52 src/sys/netinet/icmp6.h cvs rdiff -u -r1.30 -r1.31 src/sys/netinet/icmp_var.h cvs rdiff -u -r1.106 -r1.107 src/sys/netinet/in.h cvs rdiff -u -r1.8 -r1.9 src/sys/netinet/ip_carp.h cvs rdiff -u -r1.2 -r1.3 src/sys/netinet/pim_var.h cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/sctp_var.h cvs rdiff -u -r1.186 -r1.187 src/sys/netinet/tcp_var.h cvs rdiff -u -r1.43 -r1.44 src/sys/netinet/udp_var.h cvs rdiff -u -r1.92 -r1.93 src/sys/netinet6/in6.h cvs rdiff -u -r1.14 -r1.15 src/sys/netinet6/pim6_var.h cvs rdiff -u -r1.4 -r1.5 src/sys/netinet6/raw_ip6.h cvs rdiff -u -r1.28 -r1.29 src/sys/netinet6/udp6_var.h cvs rdiff -u -r1.7 -r1.8 src/sys/netipsec/ipsec_var.h cvs rdiff -u -r1.77 -r1.78 src/sys/nfs/nfs.h cvs rdiff -u -r1.209 -r1.210 src/sys/sys/mbuf.h cvs rdiff -u -r1.230 -r1.231 src/sys/sys/mount.h cvs rdiff -u -r1.35 -r1.36 src/sys/sys/pipe.h cvs rdiff -u -r1.126 -r1.127 src/sys/sys/socket.h cvs rdiff -u -r1.227 -r1.228 src/sys/sys/sysctl.h cvs rdiff -u -r1.84 -r1.85 src/sys/ufs/ffs/ffs_extern.h cvs rdiff -u -r1.113 -r1.114 src/sys/ufs/lfs/lfs_extern.h cvs rdiff -u -r1.37 -r1.38 src/sys/uvm/uvm_param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/comp/ad.m68k diff -u src/distrib/sets/lists/comp/ad.m68k:1.56 src/distrib/sets/lists/comp/ad.m68k:1.57 --- src/distrib/sets/lists/comp/ad.m68k:1.56 Thu Jul 12 10:46:40 2018 +++ src/distrib/sets/lists/comp/ad.m68k Wed Aug 22 01:05:21 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ad.m68k,v 1.56 2018/07/12 10:46:40 maxv Exp $ +# $NetBSD: ad.m68k,v 1.57 2018/08/22 01:05:21 msaitoh Exp $ ./usr/bin/elf2aout comp-sysutil-bin ./usr/include/gcc-4.8/math-68881.h comp-c-include obsolete ./usr/include/gcc-4.8/tgmath.h comp-c-include obsolete @@ -60,7 +60,7 @@ ./usr/include/m68k/stdarg.h comp-obsolete obsolete ./usr/include/m68k/svr4_machdep.h comp-obsolete obsolete ./usr/include/m68k/sync_icache.h comp-c-include -./usr/include/m68k/sysctl.h comp-c-include +./usr/include/m68k/sysctl.h comp-c-include obsolete ./usr/include/m68k/trap.h comp-c-include ./usr/include/m68k/types.h comp-c-include ./usr/include/m68k/varargs.h comp-obsolete obsolete Index: src/sys/arch/alpha/include/cpu.h diff -u src/sys/arch/alpha/include/cpu.h:1.83 src/sys/arch/alpha/include/cpu.h:1.84 --- src/sys/arch/alpha/include/cpu.h:1.83 Sat Dec 17 14:36:29 2016 +++ src/sys/arch/alpha/include/cpu.h Wed Aug 22 01:05:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.83 2016/12/17 14:36:29 flxd Exp $ */ +/* $NetBSD: cpu.h,v 1.84 2018/08/22 01:05:21 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -238,7 +238,6 @@ do { \ #define CPU_UNALIGNED_SIGBUS 5 /* int: SIGBUS unaligned accesses */ #define CPU_BOOTED_KERNEL 6 /* string: booted kernel name */ #define CPU_FP_SYNC_COMPLETE 7 /* int: always fixup sync fp traps */ -#define CPU_MAXID 8 /* 7 valid machdep IDs */ #ifdef _KERNEL Index: src/sys/arch/amiga/include/cpu.h diff -u src/sys/arch/amiga/include/cpu.h:1.81 src/sys/arch/amiga/include/cpu.h:1.82 --- src/sys/arch/amiga/include/cpu.h:1.81 Sat Dec 17 14:36:29 2016 +++ src/sys/arch/amiga/include/cpu.h Wed Aug 22 01:05:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.81 2016/12/17 14:36:29 flxd Exp $ */ +/* $NetBSD: cpu.h,v 1.82 2018/08/22 01:05:21 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -116,15 +116,6 @@ extern int astpending; /* need trap bef extern int machineid; -#endif /* _KERNEL */ - -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ - -#ifdef _KERNEL /* * Prototypes from amiga_init.c */ Index: src/sys/arch/arm/include/cpu.h diff -u src/sys/arch/arm/include/cpu.h:1.96 src/sys/arch/arm/include/cpu.h:1.97 --- src/sys/arch/arm/include/cpu.h:1.96 Sun Apr 1 04:35:04 2018 +++ src/sys/arch/arm/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.96 2018/04/01 04:35:04 ryo Exp $ */ +/* $NetBSD: cpu.h,v 1.97 2018/08/22 01:05:22 msaitoh Exp $ */ /* * Copyright (c) 1994-1996 Mark Brinicombe. @@ -60,7 +60,6 @@ #define CPU_BOOTED_KERNEL 3 /* string: kernel we booted */ #define CPU_CONSDEV 4 /* struct: dev_t of our console */ #define CPU_POWERSAVE 5 /* int: use CPU powersave mode */ -#define CPU_MAXID 6 /* number of valid machdep ids */ #if defined(_KERNEL) || defined(_KMEMUSER) Index: src/sys/arch/atari/include/cpu.h diff -u src/sys/arch/atari/include/cpu.h:1.70 src/sys/arch/atari/include/cpu.h:1.71 --- src/sys/arch/atari/include/cpu.h:1.70 Sat Oct 19 19:20:59 2013 +++ src/sys/arch/atari/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.70 2013/10/19 19:20:59 christos Exp $ */ +/* $NetBSD: cpu.h,v 1.71 2018/08/22 01:05:22 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -139,15 +139,7 @@ extern int astpending; /* need trap befo #if defined(_KERNEL) extern int machineid; -#endif /* _KERNEL */ - -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ -#ifdef _KERNEL /* * Prototypes from atari_init.c */ Index: src/sys/arch/cesfic/include/cpu.h diff -u src/sys/arch/cesfic/include/cpu.h:1.30 src/sys/arch/cesfic/include/cpu.h:1.31 --- src/sys/arch/cesfic/include/cpu.h:1.30 Sat Dec 17 14:36:29 2016 +++ src/sys/arch/cesfic/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.30 2016/12/17 14:36:29 flxd Exp $ */ +/* $NetBSD: cpu.h,v 1.31 2018/08/22 01:05:22 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -102,16 +102,6 @@ struct clockframe { extern int astpending; /* need to trap before returning to user mode */ #define aston() (astpending++) -#endif /* _KERNEL */ - -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ - -#ifdef _KERNEL - #ifndef M68040 #define M68040 #endif /* ! M68040 */ Index: src/sys/arch/evbcf/include/cpu.h diff -u src/sys/arch/evbcf/include/cpu.h:1.3 src/sys/arch/evbcf/include/cpu.h:1.4 --- src/sys/arch/evbcf/include/cpu.h:1.3 Sat Dec 17 14:36:29 2016 +++ src/sys/arch/evbcf/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.3 2016/12/17 14:36:29 flxd Exp $ */ +/* $NetBSD: cpu.h,v 1.4 2018/08/22 01:05:22 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -106,15 +106,6 @@ extern volatile unsigned int interrupt_d extern int astpending; /* need to trap before returning to user mode */ #define aston() (astpending++) -#endif /* _KERNEL */ - -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ - -#ifdef _KERNEL /* * Associate MVME models with CPU types. */ Index: src/sys/arch/hp300/include/cpu.h diff -u src/sys/arch/hp300/include/cpu.h:1.69 src/sys/arch/hp300/include/cpu.h:1.70 --- src/sys/arch/hp300/include/cpu.h:1.69 Sat Dec 17 14:36:29 2016 +++ src/sys/arch/hp300/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.69 2016/12/17 14:36:29 flxd Exp $ */ +/* $NetBSD: cpu.h,v 1.70 2018/08/22 01:05:22 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -111,20 +111,11 @@ struct clockframe { extern int astpending; /* need to trap before returning to user mode */ #define aston() (astpending++) -#endif /* _KERNEL */ - -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ - /* * The rest of this should probably be moved to <machine/hp300spu.h>, * although some of it could probably be put into generic 68k headers. */ -#ifdef _KERNEL extern uint8_t *intiobase, *intiolimit, *extiobase; extern void (*vectab[])(void); Index: src/sys/arch/hppa/include/cpu.h diff -u src/sys/arch/hppa/include/cpu.h:1.3 src/sys/arch/hppa/include/cpu.h:1.4 --- src/sys/arch/hppa/include/cpu.h:1.3 Mon Jan 25 18:14:40 2016 +++ src/sys/arch/hppa/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.3 2016/01/25 18:14:40 christos Exp $ */ +/* $NetBSD: cpu.h,v 1.4 2018/08/22 01:05:22 msaitoh Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -422,7 +422,6 @@ void cpu_hatch(void); #define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_BOOTED_KERNEL 2 /* string: booted kernel name */ #define CPU_LCD_BLINK 3 /* int: twiddle heartbeat LED/LCD */ -#define CPU_MAXID 4 /* number of valid machdep ids */ #ifdef _KERNEL #include <sys/queue.h> Index: src/sys/arch/luna68k/include/cpu.h diff -u src/sys/arch/luna68k/include/cpu.h:1.34 src/sys/arch/luna68k/include/cpu.h:1.35 --- src/sys/arch/luna68k/include/cpu.h:1.34 Fri Jun 16 18:17:41 2017 +++ src/sys/arch/luna68k/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.34 2017/06/16 18:17:41 jdolecek Exp $ */ +/* $NetBSD: cpu.h,v 1.35 2018/08/22 01:05:22 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -106,12 +106,6 @@ extern int astpending; /* need to trap b #endif /* _KERNEL */ /* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ - -/* * Values for machtype */ #define LUNA_I 1 Index: src/sys/arch/m68k/include/Makefile diff -u src/sys/arch/m68k/include/Makefile:1.30 src/sys/arch/m68k/include/Makefile:1.31 --- src/sys/arch/m68k/include/Makefile:1.30 Thu Jul 12 10:46:45 2018 +++ src/sys/arch/m68k/include/Makefile Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2018/07/12 10:46:45 maxv Exp $ +# $NetBSD: Makefile,v 1.31 2018/08/22 01:05:22 msaitoh Exp $ INCSDIR= /usr/include/m68k @@ -16,7 +16,6 @@ INCS= ansi.h aout_machdep.h asm.h asm_si param.h pmap_motorola.h pcb.h proc.h profile.h \ psl.h pte_motorola.h ptrace.h \ reg.h rwlock.h setjmp.h signal.h sync_icache.h \ - sysctl.h \ trap.h types.h \ wchar_limits.h Index: src/sys/arch/m68k/include/cpu.h diff -u src/sys/arch/m68k/include/cpu.h:1.15 src/sys/arch/m68k/include/cpu.h:1.16 --- src/sys/arch/m68k/include/cpu.h:1.15 Mon Sep 19 19:17:05 2011 +++ src/sys/arch/m68k/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.15 2011/09/19 19:17:05 rkujawa Exp $ */ +/* $NetBSD: cpu.h,v 1.16 2018/08/22 01:05:22 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -162,6 +162,11 @@ #define CACHELINE_SIZE 16 #define CACHELINE_MASK (CACHELINE_SIZE - 1) +/* CTL_MACHDEP definitions. (Common to all m68k ports.) */ +#define CPU_CONSDEV 1 /* dev_t: console terminal device */ +#define CPU_ROOT_DEVICE 2 /* string: root device name */ +#define CPU_BOOTED_KERNEL 3 /* string: booted kernel name */ + #if defined(_KERNEL) || defined(_KMEMUSER) #include <sys/cpu_data.h> Index: src/sys/arch/mac68k/include/cpu.h diff -u src/sys/arch/mac68k/include/cpu.h:1.99 src/sys/arch/mac68k/include/cpu.h:1.100 --- src/sys/arch/mac68k/include/cpu.h:1.99 Sat Dec 17 14:36:29 2016 +++ src/sys/arch/mac68k/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.99 2016/12/17 14:36:29 flxd Exp $ */ +/* $NetBSD: cpu.h,v 1.100 2018/08/22 01:05:22 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -123,9 +123,6 @@ extern int astpending; /* need to trap #endif /* _KERNEL */ -#define CPU_CONSDEV 1 -#define CPU_MAXID 2 - /* values for machineid -- * These are equivalent to the MacOS Gestalt values. */ #define MACH_MACII 6 Index: src/sys/arch/mips/include/cpu.h diff -u src/sys/arch/mips/include/cpu.h:1.124 src/sys/arch/mips/include/cpu.h:1.125 --- src/sys/arch/mips/include/cpu.h:1.124 Wed Mar 7 23:08:29 2018 +++ src/sys/arch/mips/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.124 2018/03/07 23:08:29 maya Exp $ */ +/* $NetBSD: cpu.h,v 1.125 2018/08/22 01:05:22 msaitoh Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -290,12 +290,4 @@ void cpu_vmspace_exec(struct lwp *, vadd #define CPU_LLSC 4 /* OS/CPU supports LL/SC instruction */ #define CPU_LMMI 5 /* Loongson multimedia instructions */ -/* - * Platform can override, but note this breaks userland compatibility - * with other mips platforms. - */ -#ifndef CPU_MAXID -#define CPU_MAXID 5 /* number of valid machdep ids */ -#endif - #endif /* _CPU_H_ */ Index: src/sys/arch/mvme68k/include/cpu.h diff -u src/sys/arch/mvme68k/include/cpu.h:1.49 src/sys/arch/mvme68k/include/cpu.h:1.50 --- src/sys/arch/mvme68k/include/cpu.h:1.49 Sat Dec 17 14:36:30 2016 +++ src/sys/arch/mvme68k/include/cpu.h Wed Aug 22 01:05:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.49 2016/12/17 14:36:30 flxd Exp $ */ +/* $NetBSD: cpu.h,v 1.50 2018/08/22 01:05:22 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -109,15 +109,6 @@ extern volatile unsigned int interrupt_d extern int astpending; /* need to trap before returning to user mode */ #define aston() (astpending++) -#endif /* _KERNEL */ - -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ - -#ifdef _KERNEL /* * Associate MVME models with CPU types. */ Index: src/sys/arch/news68k/include/cpu.h diff -u src/sys/arch/news68k/include/cpu.h:1.43 src/sys/arch/news68k/include/cpu.h:1.44 --- src/sys/arch/news68k/include/cpu.h:1.43 Sat Dec 17 14:36:30 2016 +++ src/sys/arch/news68k/include/cpu.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.43 2016/12/17 14:36:30 flxd Exp $ */ +/* $NetBSD: cpu.h,v 1.44 2018/08/22 01:05:23 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -129,16 +129,6 @@ extern volatile u_char *ctrl_ast; #define aston() \ do { astpending++; *ctrl_ast = 0xff; } while (/* CONSTCOND */0) -#endif /* _KERNEL */ - -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ - -#ifdef _KERNEL - #if defined(news1700) || defined(news1200) #ifndef M68030 #define M68030 @@ -150,9 +140,6 @@ extern volatile u_char *ctrl_ast; #define CACHE_HAVE_PAC #endif -#endif - -#ifdef _KERNEL extern int systype; #define NEWS1700 0 #define NEWS1200 1 Index: src/sys/arch/powerpc/include/cpu.h diff -u src/sys/arch/powerpc/include/cpu.h:1.107 src/sys/arch/powerpc/include/cpu.h:1.108 --- src/sys/arch/powerpc/include/cpu.h:1.107 Sun Jul 15 05:16:44 2018 +++ src/sys/arch/powerpc/include/cpu.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.107 2018/07/15 05:16:44 maxv Exp $ */ +/* $NetBSD: cpu.h,v 1.108 2018/08/22 01:05:23 msaitoh Exp $ */ /* * Copyright (C) 1999 Wolfgang Solfrank. @@ -489,6 +489,5 @@ void __syncicache(void *, size_t); #define CPU_BOOTED_DEVICE 9 /* string: device we booted from */ #define CPU_BOOTED_KERNEL 10 /* string: kernel we booted */ #define CPU_EXECPROT 11 /* bool: PROT_EXEC works */ -#define CPU_MAXID 12 /* number of valid machdep ids */ #endif /* _POWERPC_CPU_H_ */ Index: src/sys/arch/sh3/include/cpu.h diff -u src/sys/arch/sh3/include/cpu.h:1.56 src/sys/arch/sh3/include/cpu.h:1.57 --- src/sys/arch/sh3/include/cpu.h:1.56 Sat Oct 19 19:20:59 2013 +++ src/sys/arch/sh3/include/cpu.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.56 2013/10/19 19:20:59 christos Exp $ */ +/* $NetBSD: cpu.h,v 1.57 2018/08/22 01:05:23 msaitoh Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved. @@ -246,7 +246,6 @@ do { \ */ #define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_LOADANDRESET 2 /* load kernel image and reset */ -#define CPU_MAXID 3 /* number of valid machdep ids */ #ifdef _KERNEL void sh_cpu_init(int, int); Index: src/sys/arch/sparc/include/cpu.h diff -u src/sys/arch/sparc/include/cpu.h:1.100 src/sys/arch/sparc/include/cpu.h:1.101 --- src/sys/arch/sparc/include/cpu.h:1.100 Tue Jan 16 08:23:17 2018 +++ src/sys/arch/sparc/include/cpu.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.100 2018/01/16 08:23:17 mrg Exp $ */ +/* $NetBSD: cpu.h,v 1.101 2018/08/22 01:05:23 msaitoh Exp $ */ /* * Copyright (c) 1992, 1993 @@ -50,7 +50,6 @@ #define CPU_BOOTED_DEVICE 2 /* string: device booted from */ #define CPU_BOOT_ARGS 3 /* string: args booted with */ #define CPU_ARCH 4 /* integer: cpu architecture version */ -#define CPU_MAXID 5 /* number of valid machdep ids */ /* * Exported definitions unique to SPARC cpu support. Index: src/sys/arch/sparc64/include/cpu.h diff -u src/sys/arch/sparc64/include/cpu.h:1.124 src/sys/arch/sparc64/include/cpu.h:1.125 --- src/sys/arch/sparc64/include/cpu.h:1.124 Tue Jan 16 08:23:17 2018 +++ src/sys/arch/sparc64/include/cpu.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.124 2018/01/16 08:23:17 mrg Exp $ */ +/* $NetBSD: cpu.h,v 1.125 2018/08/22 01:05:23 msaitoh Exp $ */ /* * Copyright (c) 1992, 1993 @@ -51,7 +51,6 @@ #define CPU_BOOT_ARGS 3 /* string: args booted with */ #define CPU_ARCH 4 /* integer: cpu architecture version */ #define CPU_VIS 5 /* 0 - no VIS, 1 - VIS 1.0, etc. */ -#define CPU_MAXID 6 /* number of valid machdep ids */ /* * This is exported via sysctl for cpuctl(8). Index: src/sys/arch/vax/include/cpu.h diff -u src/sys/arch/vax/include/cpu.h:1.101 src/sys/arch/vax/include/cpu.h:1.102 --- src/sys/arch/vax/include/cpu.h:1.101 Fri Jun 16 18:17:42 2017 +++ src/sys/arch/vax/include/cpu.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.101 2017/06/16 18:17:42 jdolecek Exp $ */ +/* $NetBSD: cpu.h,v 1.102 2018/08/22 01:05:23 msaitoh Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden @@ -37,7 +37,6 @@ #define CPU_CONSDEV 2 #define CPU_BOOTED_DEVICE 3 #define CPU_BOOTED_KERNEL 4 -#define CPU_MAXID 5 #ifdef _KERNEL Index: src/sys/arch/x68k/include/cpu.h diff -u src/sys/arch/x68k/include/cpu.h:1.59 src/sys/arch/x68k/include/cpu.h:1.60 --- src/sys/arch/x68k/include/cpu.h:1.59 Sat Dec 17 14:36:30 2016 +++ src/sys/arch/x68k/include/cpu.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.59 2016/12/17 14:36:30 flxd Exp $ */ +/* $NetBSD: cpu.h,v 1.60 2018/08/22 01:05:23 msaitoh Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -111,20 +111,11 @@ struct clockframe { extern int astpending; /* need to trap before returning to user mode */ #define aston() (astpending++) -#endif /* _KERNEL */ - -/* - * CTL_MACHDEP definitions. - */ -#define CPU_CONSDEV 1 /* dev_t: console terminal device */ -#define CPU_MAXID 2 /* number of valid machdep ids */ - /* * The rest of this should probably be moved to <machine/x68kcpu.h> * although some of it could probably be put into generic 68k headers. */ -#ifdef _KERNEL extern uint8_t *intiobase; extern uint8_t *intiolimit; Index: src/sys/arch/x86/include/cpu.h diff -u src/sys/arch/x86/include/cpu.h:1.96 src/sys/arch/x86/include/cpu.h:1.97 --- src/sys/arch/x86/include/cpu.h:1.96 Mon Jul 16 07:07:30 2018 +++ src/sys/arch/x86/include/cpu.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.96 2018/07/16 07:07:30 pgoyette Exp $ */ +/* $NetBSD: cpu.h,v 1.97 2018/08/22 01:05:23 msaitoh Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -563,8 +563,6 @@ void x86_bus_space_mallocok(void); #define CPU_FPU_SAVE_SIZE 16 /* int: FPU Instruction layout size */ #define CPU_XSAVE_FEATURES 17 /* quad: XSAVE features */ -#define CPU_MAXID 18 /* number of valid machdep ids */ - /* * Structure for CPU_DISKINFO sysctl call. * XXX this should be somewhere else. Index: src/sys/compat/linux/common/linux_exec.h diff -u src/sys/compat/linux/common/linux_exec.h:1.52 src/sys/compat/linux/common/linux_exec.h:1.53 --- src/sys/compat/linux/common/linux_exec.h:1.52 Sun Feb 12 21:02:20 2017 +++ src/sys/compat/linux/common/linux_exec.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec.h,v 1.52 2017/02/12 21:02:20 chs Exp $ */ +/* $NetBSD: linux_exec.h,v 1.53 2018/08/22 01:05:23 msaitoh Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -107,24 +107,10 @@ * Emulation specific sysctls. */ #define EMUL_LINUX_KERN 1 -#define EMUL_LINUX_MAXID 2 - -#define EMUL_LINUX_NAMES { \ - { 0, 0 }, \ - { "kern", CTLTYPE_NODE }, \ -} #define EMUL_LINUX_KERN_OSTYPE 1 #define EMUL_LINUX_KERN_OSRELEASE 2 #define EMUL_LINUX_KERN_VERSION 3 -#define EMUL_LINUX_KERN_MAXID 4 - -#define EMUL_LINUX_KERN_NAMES { \ - { 0, 0 }, \ - { "ostype", CTLTYPE_STRING }, \ - { "osrelease", CTLTYPE_STRING }, \ - { "osversion", CTLTYPE_STRING }, \ -} #ifdef _KERNEL __BEGIN_DECLS Index: src/sys/compat/linux32/common/linux32_sysctl.h diff -u src/sys/compat/linux32/common/linux32_sysctl.h:1.3 src/sys/compat/linux32/common/linux32_sysctl.h:1.4 --- src/sys/compat/linux32/common/linux32_sysctl.h:1.3 Fri Sep 29 17:47:29 2017 +++ src/sys/compat/linux32/common/linux32_sysctl.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_sysctl.h,v 1.3 2017/09/29 17:47:29 maxv Exp $ */ +/* $NetBSD: linux32_sysctl.h,v 1.4 2018/08/22 01:05:23 msaitoh Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -39,24 +39,10 @@ extern char linux32_version[]; #define EMUL_LINUX32_KERN 1 -#define EMUL_LINUX32_MAXID 2 - -#define EMUL_LINUX32_NAMES { \ - { 0, 0 }, \ - { "kern", CTLTYPE_NODE }, \ -} #define EMUL_LINUX32_KERN_OSTYPE 1 #define EMUL_LINUX32_KERN_OSRELEASE 2 #define EMUL_LINUX32_KERN_VERSION 3 -#define EMUL_LINUX32_KERN_MAXID 4 - -#define EMUL_LINUX32_KERN_NAMES { \ - { 0, 0 }, \ - { "ostype", CTLTYPE_STRING }, \ - { "osrelease", CTLTYPE_STRING }, \ - { "osversion", CTLTYPE_STRING }, \ -} void linux32_sysctl_init(void); void linux32_sysctl_fini(void); Index: src/sys/fs/cd9660/cd9660_extern.h diff -u src/sys/fs/cd9660/cd9660_extern.h:1.26 src/sys/fs/cd9660/cd9660_extern.h:1.27 --- src/sys/fs/cd9660/cd9660_extern.h:1.26 Sun Jun 23 07:28:36 2013 +++ src/sys/fs/cd9660/cd9660_extern.h Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_extern.h,v 1.26 2013/06/23 07:28:36 dholland Exp $ */ +/* $NetBSD: cd9660_extern.h,v 1.27 2018/08/22 01:05:23 msaitoh Exp $ */ /*- * Copyright (c) 1994 @@ -47,12 +47,6 @@ */ #define CD9660_UTF8_JOLIET 1 /* UTF-8 encode Joliet file names */ -#define CD9660_NAMES { \ - { 0, 0 }, \ - { "utf8_joliet", CTLTYPE_INT }, \ -} - - /* CD-ROM Format type */ enum ISO_FTYPE { ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP, ISO_FTYPE_ECMA }; Index: src/sys/kern/init_sysctl.c diff -u src/sys/kern/init_sysctl.c:1.214 src/sys/kern/init_sysctl.c:1.215 --- src/sys/kern/init_sysctl.c:1.214 Sun Feb 4 17:31:51 2018 +++ src/sys/kern/init_sysctl.c Wed Aug 22 01:05:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysctl.c,v 1.214 2018/02/04 17:31:51 maxv Exp $ */ +/* $NetBSD: init_sysctl.c,v 1.215 2018/08/22 01:05:23 msaitoh Exp $ */ /*- * Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.214 2018/02/04 17:31:51 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.215 2018/08/22 01:05:23 msaitoh Exp $"); #include "opt_sysv.h" #include "opt_compat_netbsd.h" @@ -632,6 +632,8 @@ struct ctldebug /* debug0, */ /* debug1, struct ctldebug debug5, debug6, debug7, debug8, debug9; struct ctldebug debug10, debug11, debug12, debug13, debug14; struct ctldebug debug15, debug16, debug17, debug18, debug19; + +#define CTL_DEBUG_MAXID 20 static struct ctldebug *debugvars[CTL_DEBUG_MAXID] = { &debug0, &debug1, &debug2, &debug3, &debug4, &debug5, &debug6, &debug7, &debug8, &debug9, Index: src/sys/net/if.h diff -u src/sys/net/if.h:1.264 src/sys/net/if.h:1.265 --- src/sys/net/if.h:1.264 Tue Jul 3 03:37:03 2018 +++ src/sys/net/if.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if.h,v 1.264 2018/07/03 03:37:03 ozaki-r Exp $ */ +/* $NetBSD: if.h,v 1.265 2018/08/22 01:05:24 msaitoh Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -1324,24 +1324,11 @@ int sysctl_ifq(int *name, u_int namelen, size_t *oldlenp, void *newp, size_t newlen, struct ifqueue *ifq); /* symbolic names for terminal (per-protocol) CTL_IFQ_ nodes */ -#define IFQCTL_LEN 1 -#define IFQCTL_MAXLEN 2 -#define IFQCTL_PEAK 3 -#define IFQCTL_DROPS 4 -#define IFQCTL_MAXID 5 +#define IFQCTL_LEN 1 +#define IFQCTL_MAXLEN 2 +#define IFQCTL_PEAK 3 +#define IFQCTL_DROPS 4 #endif /* _KERNEL */ -#ifdef _NETBSD_SOURCE -/* - * sysctl for ifq (per-protocol packet input queue variant of ifqueue) - */ -#define CTL_IFQ_NAMES { \ - { 0, 0 }, \ - { "len", CTLTYPE_INT }, \ - { "maxlen", CTLTYPE_INT }, \ - { "peak", CTLTYPE_INT }, \ - { "drops", CTLTYPE_INT }, \ -} -#endif /* _NETBSD_SOURCE */ #endif /* !_NET_IF_H_ */ Index: src/sys/netinet/dccp_var.h diff -u src/sys/netinet/dccp_var.h:1.3 src/sys/netinet/dccp_var.h:1.4 --- src/sys/netinet/dccp_var.h:1.3 Thu Jul 7 06:55:43 2016 +++ src/sys/netinet/dccp_var.h Wed Aug 22 01:05:24 2018 @@ -1,5 +1,5 @@ /* $KAME: dccp_var.h,v 1.29 2005/11/03 14:59:28 nishida Exp $ */ -/* $NetBSD: dccp_var.h,v 1.3 2016/07/07 06:55:43 msaitoh Exp $ */ +/* $NetBSD: dccp_var.h,v 1.4 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 2003 Joacim Häggmark, Magnus Erixzon, Nils-Erik Mattsson @@ -258,14 +258,6 @@ extern const char *dccpstates[]; #define DCCPCTL_SENDSPACE 4 #define DCCPCTL_RECVSPACE 5 -#define DCCPCTL_NAMES { \ - { 0, 0 }, \ - { "defccid", CTLTYPE_INT }, \ - { "stats", CTLTYPE_STRUCT }, \ - { "sendspace", CTLTYPE_INT }, \ - { "recvspace", CTLTYPE_INT }, \ -} - #ifdef _KERNEL #ifdef DCCP_DEBUG_ON Index: src/sys/netinet/icmp6.h diff -u src/sys/netinet/icmp6.h:1.51 src/sys/netinet/icmp6.h:1.52 --- src/sys/netinet/icmp6.h:1.51 Tue Apr 24 07:22:33 2018 +++ src/sys/netinet/icmp6.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: icmp6.h,v 1.51 2018/04/24 07:22:33 maxv Exp $ */ +/* $NetBSD: icmp6.h,v 1.52 2018/08/22 01:05:24 msaitoh Exp $ */ /* $KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun Exp $ */ @@ -636,35 +636,6 @@ struct icmp6_filter { #define ICMPV6CTL_ND6_DRLIST 19 #define ICMPV6CTL_ND6_PRLIST 20 #define ICMPV6CTL_ND6_MAXQLEN 24 -#define ICMPV6CTL_MAXID 25 - -#define ICMPV6CTL_NAMES { \ - { 0, 0 }, \ - { 0, 0 }, \ - { "rediraccept", CTLTYPE_INT }, \ - { "redirtimeout", CTLTYPE_INT }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "nd6_prune", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "nd6_delay", CTLTYPE_INT }, \ - { "nd6_umaxtries", CTLTYPE_INT }, \ - { "nd6_mmaxtries", CTLTYPE_INT }, \ - { "nd6_useloopback", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "nodeinfo", CTLTYPE_INT }, \ - { "errppslimit", CTLTYPE_INT }, \ - { "nd6_maxnudhint", CTLTYPE_INT }, \ - { "mtudisc_hiwat", CTLTYPE_INT }, \ - { "mtudisc_lowat", CTLTYPE_INT }, \ - { "nd6_debug", CTLTYPE_INT }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "nd6_maxqueuelen", CTLTYPE_INT }, \ -} #ifdef _KERNEL struct rtentry; Index: src/sys/netinet/icmp_var.h diff -u src/sys/netinet/icmp_var.h:1.30 src/sys/netinet/icmp_var.h:1.31 --- src/sys/netinet/icmp_var.h:1.30 Wed Feb 18 17:00:15 2015 +++ src/sys/netinet/icmp_var.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: icmp_var.h,v 1.30 2015/02/18 17:00:15 christos Exp $ */ +/* $NetBSD: icmp_var.h,v 1.31 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -72,19 +72,6 @@ #define ICMPCTL_REDIRTIMEOUT 6 /* Remove routes added via redirects */ #define ICMPCTL_STATS 7 /* ICMP statistics */ #define ICMPCTL_BMCASTECHO 8 /* allow broad/mult-cast echo */ -#define ICMPCTL_MAXID 9 - -#define ICMPCTL_NAMES { \ - { 0, 0 }, \ - { "maskrepl", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "returndatabytes", CTLTYPE_INT }, \ - { "errppslimit", CTLTYPE_INT }, \ - { "rediraccept", CTLTYPE_INT }, \ - { "redirtimeout", CTLTYPE_INT }, \ - { "stats", CTLTYPE_STRUCT }, \ - { "bmcastecho", CTLTYPE_INT }, \ -} #ifdef _KERNEL Index: src/sys/netinet/in.h diff -u src/sys/netinet/in.h:1.106 src/sys/netinet/in.h:1.107 --- src/sys/netinet/in.h:1.106 Wed Jul 11 05:25:45 2018 +++ src/sys/netinet/in.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: in.h,v 1.106 2018/07/11 05:25:45 maxv Exp $ */ +/* $NetBSD: in.h,v 1.107 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -335,114 +335,6 @@ struct ip_mreq { * Third level is protocol number. * Fourth level is desired variable within that protocol. */ -#define IPPROTO_MAXID (IPPROTO_AH + 1) /* don't list to IPPROTO_MAX */ - -#define CTL_IPPROTO_NAMES { \ - { "ip", CTLTYPE_NODE }, \ - { "icmp", CTLTYPE_NODE }, \ - { "igmp", CTLTYPE_NODE }, \ - { "ggp", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "tcp", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { "egp", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "pup", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "udp", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "idp", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "ipsec", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "pim", CTLTYPE_NODE }, \ -} /* * Names for IP sysctl objects @@ -472,36 +364,7 @@ struct ip_mreq { #define IPCTL_LOOPBACKCKSUM 23 /* do IP checksum on loopback */ #define IPCTL_STATS 24 /* IP statistics */ #define IPCTL_DAD_COUNT 25 /* DAD packets to send */ -#define IPCTL_MAXID 26 -#define IPCTL_NAMES { \ - { 0, 0 }, \ - { "forwarding", CTLTYPE_INT }, \ - { "redirect", CTLTYPE_INT }, \ - { "ttl", CTLTYPE_INT }, \ - { "mtu", CTLTYPE_INT }, \ - { "forwsrcrt", CTLTYPE_INT }, \ - { "directed-broadcast", CTLTYPE_INT }, \ - { "allowsrcrt", CTLTYPE_INT }, \ - { "subnetsarelocal", CTLTYPE_INT }, \ - { "mtudisc", CTLTYPE_INT }, \ - { "anonportmin", CTLTYPE_INT }, \ - { "anonportmax", CTLTYPE_INT }, \ - { "mtudisctimeout", CTLTYPE_INT }, \ - { "maxflows", CTLTYPE_INT }, \ - { "hostzerobroadcast", CTLTYPE_INT }, \ - { "gifttl", CTLTYPE_INT }, \ - { "lowportmin", CTLTYPE_INT }, \ - { "lowportmax", CTLTYPE_INT }, \ - { "maxfragpackets", CTLTYPE_INT }, \ - { "grettl", CTLTYPE_INT }, \ - { "checkinterface", CTLTYPE_INT }, \ - { "ifq", CTLTYPE_NODE }, \ - { "random_id", CTLTYPE_INT }, \ - { "do_loopback_cksum", CTLTYPE_INT }, \ - { "stats", CTLTYPE_STRUCT }, \ - { "dad_count", CTLTYPE_INT }, \ -} #endif /* _NETBSD_SOURCE */ /* INET6 stuff */ Index: src/sys/netinet/ip_carp.h diff -u src/sys/netinet/ip_carp.h:1.8 src/sys/netinet/ip_carp.h:1.9 --- src/sys/netinet/ip_carp.h:1.8 Thu Apr 28 00:16:56 2016 +++ src/sys/netinet/ip_carp.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_carp.h,v 1.8 2016/04/28 00:16:56 ozaki-r Exp $ */ +/* $NetBSD: ip_carp.h,v 1.9 2018/08/22 01:05:24 msaitoh Exp $ */ /* $OpenBSD: ip_carp.h,v 1.18 2005/04/20 23:00:41 mpf Exp $ */ /* @@ -143,14 +143,6 @@ struct carpreq { #define CARPCTL_STATS 5 /* carp statistics */ #define CARPCTL_MAXID 6 -#define CARPCTL_NAMES { \ - { 0, 0 }, \ - { "allow", CTLTYPE_INT }, \ - { "preempt", CTLTYPE_INT }, \ - { "log", CTLTYPE_INT }, \ - { "arpbalance", CTLTYPE_INT }, \ -} - #ifdef _KERNEL void carp_init(void); void carp_ifdetach(struct ifnet *); Index: src/sys/netinet/pim_var.h diff -u src/sys/netinet/pim_var.h:1.2 src/sys/netinet/pim_var.h:1.3 --- src/sys/netinet/pim_var.h:1.2 Sat Dec 10 23:36:23 2005 +++ src/sys/netinet/pim_var.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: pim_var.h,v 1.2 2005/12/10 23:36:23 elad Exp $ */ +/* $NetBSD: pim_var.h,v 1.3 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1998-2000 @@ -65,12 +65,6 @@ struct pimstat { * Names for PIM sysctl objects */ #define PIMCTL_STATS 1 /* statistics (read-only) */ -#define PIMCTL_MAXID 2 - -#define PIMCTL_NAMES { \ - { 0, 0 }, \ - { "stats", CTLTYPE_STRUCT }, \ -} #ifdef _KERNEL extern struct pimstat pimstat; Index: src/sys/netinet/sctp_var.h diff -u src/sys/netinet/sctp_var.h:1.1 src/sys/netinet/sctp_var.h:1.2 --- src/sys/netinet/sctp_var.h:1.1 Tue Oct 13 21:28:35 2015 +++ src/sys/netinet/sctp_var.h Wed Aug 22 01:05:24 2018 @@ -1,5 +1,5 @@ /* $KAME: sctp_var.h,v 1.24 2005/03/06 16:04:19 itojun Exp $ */ -/* $NetBSD: sctp_var.h,v 1.1 2015/10/13 21:28:35 rjs Exp $ */ +/* $NetBSD: sctp_var.h,v 1.2 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc. @@ -77,74 +77,10 @@ #define SCTPCTL_NR_OUTGOING_STREAMS 25 #ifdef SCTP_DEBUG #define SCTPCTL_DEBUG 26 -#define SCTPCTL_MAXID 27 -#else -#define SCTPCTL_MAXID 26 #endif #endif -#ifdef SCTP_DEBUG -#define SCTPCTL_NAMES { \ - { 0, 0 }, \ - { "maxdgram", CTLTYPE_INT }, \ - { "recvspace", CTLTYPE_INT }, \ - { "autoasconf", CTLTYPE_INT }, \ - { "ecn_enable", CTLTYPE_INT }, \ - { "ecn_nonce", CTLTYPE_INT }, \ - { "strict_sack", CTLTYPE_INT }, \ - { "looback_nocsum", CTLTYPE_INT }, \ - { "strict_init", CTLTYPE_INT }, \ - { "peer_chkoh", CTLTYPE_INT }, \ - { "maxburst", CTLTYPE_INT }, \ - { "maxchunks", CTLTYPE_INT }, \ - { "delayed_sack_time", CTLTYPE_INT }, \ - { "heartbeat_interval", CTLTYPE_INT }, \ - { "pmtu_raise_time", CTLTYPE_INT }, \ - { "shutdown_guard_time", CTLTYPE_INT }, \ - { "secret_lifetime", CTLTYPE_INT }, \ - { "rto_max", CTLTYPE_INT }, \ - { "rto_min", CTLTYPE_INT }, \ - { "rto_initial", CTLTYPE_INT }, \ - { "init_rto_max", CTLTYPE_INT }, \ - { "valid_cookie_life", CTLTYPE_INT }, \ - { "init_rtx_max", CTLTYPE_INT }, \ - { "assoc_rtx_max", CTLTYPE_INT }, \ - { "path_rtx_max", CTLTYPE_INT }, \ - { "nr_outgoing_streams", CTLTYPE_INT }, \ - { "debug", CTLTYPE_INT }, \ -} -#else -#define SCTPCTL_NAMES { \ - { 0, 0 }, \ - { "maxdgram", CTLTYPE_INT }, \ - { "recvspace", CTLTYPE_INT }, \ - { "autoasconf", CTLTYPE_INT }, \ - { "ecn_enable", CTLTYPE_INT }, \ - { "ecn_nonce", CTLTYPE_INT }, \ - { "strict_sack", CTLTYPE_INT }, \ - { "looback_nocsum", CTLTYPE_INT }, \ - { "strict_init", CTLTYPE_INT }, \ - { "peer_chkoh", CTLTYPE_INT }, \ - { "maxburst", CTLTYPE_INT }, \ - { "maxchunks", CTLTYPE_INT }, \ - { "delayed_sack_time", CTLTYPE_INT }, \ - { "heartbeat_interval", CTLTYPE_INT }, \ - { "pmtu_raise_time", CTLTYPE_INT }, \ - { "shutdown_guard_time", CTLTYPE_INT }, \ - { "secret_lifetime", CTLTYPE_INT }, \ - { "rto_max", CTLTYPE_INT }, \ - { "rto_min", CTLTYPE_INT }, \ - { "rto_initial", CTLTYPE_INT }, \ - { "init_rto_max", CTLTYPE_INT }, \ - { "valid_cookie_life", CTLTYPE_INT }, \ - { "init_rtx_max", CTLTYPE_INT }, \ - { "assoc_rtx_max", CTLTYPE_INT }, \ - { "path_rtx_max", CTLTYPE_INT }, \ - { "nr_outgoing_streams", CTLTYPE_INT }, \ -} -#endif - #if defined(_KERNEL) extern const struct pr_usrreqs sctp_usrreqs; Index: src/sys/netinet/tcp_var.h diff -u src/sys/netinet/tcp_var.h:1.186 src/sys/netinet/tcp_var.h:1.187 --- src/sys/netinet/tcp_var.h:1.186 Sun Apr 29 12:12:42 2018 +++ src/sys/netinet/tcp_var.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_var.h,v 1.186 2018/04/29 12:12:42 maxv Exp $ */ +/* $NetBSD: tcp_var.h,v 1.187 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -779,45 +779,6 @@ struct syn_cache_head { #define TCPCTL_DEBX 32 /* # of tcp debug sockets */ #define TCPCTL_DROP 33 /* drop tcp connection */ #define TCPCTL_MSL 34 /* Max Segment Life */ -#define TCPCTL_MAXID 35 - -#define TCPCTL_NAMES { \ - { 0, 0 }, \ - { "rfc1323", CTLTYPE_INT }, \ - { "sendspace", CTLTYPE_INT }, \ - { "recvspace", CTLTYPE_INT }, \ - { "mssdflt", CTLTYPE_INT }, \ - { "syn_cache_limit", CTLTYPE_INT }, \ - { "syn_bucket_limit", CTLTYPE_INT }, \ - { 0, 0 },\ - { "init_win", CTLTYPE_INT }, \ - { "mss_ifmtu", CTLTYPE_INT }, \ - { "sack", CTLTYPE_INT }, \ - { "win_scale", CTLTYPE_INT }, \ - { "timestamps", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "cwm", CTLTYPE_INT }, \ - { "cwm_burstsize", CTLTYPE_INT }, \ - { "ack_on_push", CTLTYPE_INT }, \ - { "keepidle", CTLTYPE_INT }, \ - { "keepintvl", CTLTYPE_INT }, \ - { "keepcnt", CTLTYPE_INT }, \ - { "slowhz", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "log_refused",CTLTYPE_INT }, \ - { 0, 0 }, \ - { "rstppslimit", CTLTYPE_INT }, \ - { "delack_ticks", CTLTYPE_INT }, \ - { "init_win_local", CTLTYPE_INT }, \ - { "ident", CTLTYPE_STRUCT }, \ - { "ackdropppslimit", CTLTYPE_INT }, \ - { "do_loopback_cksum", CTLTYPE_INT }, \ - { "stats", CTLTYPE_STRUCT }, \ - { "debug", CTLTYPE_STRUCT }, \ - { "debx", CTLTYPE_INT }, \ - { "drop", CTLTYPE_STRUCT }, \ - { "msl", CTLTYPE_INT }, \ -} #ifdef _KERNEL Index: src/sys/netinet/udp_var.h diff -u src/sys/netinet/udp_var.h:1.43 src/sys/netinet/udp_var.h:1.44 --- src/sys/netinet/udp_var.h:1.43 Thu Feb 8 10:30:30 2018 +++ src/sys/netinet/udp_var.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_var.h,v 1.43 2018/02/08 10:30:30 maxv Exp $ */ +/* $NetBSD: udp_var.h,v 1.44 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -75,16 +75,6 @@ struct udpiphdr { #define UDPCTL_RECVSPACE 3 /* default recv buffer */ #define UDPCTL_LOOPBACKCKSUM 4 /* do UDP checksum on loopback */ #define UDPCTL_STATS 5 /* UDP statistics */ -#define UDPCTL_MAXID 7 - -#define UDPCTL_NAMES { \ - { 0, 0 }, \ - { "checksum", CTLTYPE_INT }, \ - { "sendspace", CTLTYPE_INT }, \ - { "recvspace", CTLTYPE_INT }, \ - { "do_loopback_cksum", CTLTYPE_INT }, \ - { "stats", CTLTYPE_STRUCT }, \ -} #ifdef _KERNEL Index: src/sys/netinet6/in6.h diff -u src/sys/netinet6/in6.h:1.92 src/sys/netinet6/in6.h:1.93 --- src/sys/netinet6/in6.h:1.92 Fri Aug 10 06:46:09 2018 +++ src/sys/netinet6/in6.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: in6.h,v 1.92 2018/08/10 06:46:09 maxv Exp $ */ +/* $NetBSD: in6.h,v 1.93 2018/08/22 01:05:24 msaitoh Exp $ */ /* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */ /* @@ -491,55 +491,6 @@ struct ip6_mtuinfo { * Third level is protocol number. * Fourth level is desired variable within that protocol. */ -#define IPV6PROTO_MAXID (IPPROTO_PIM + 1) /* don't list to IPV6PROTO_MAX */ - -#define CTL_IPV6PROTO_NAMES { \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, \ - { "tcp6", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "udp6", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, \ - { "ip6", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, \ - { "ipsec6", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "icmp6", CTLTYPE_NODE }, \ - { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "pim6", CTLTYPE_NODE }, \ -} - /* * Names for IP sysctl objects */ @@ -584,58 +535,6 @@ struct ip6_mtuinfo { /* via router advertisement */ #define IPV6CTL_RTADV_NUMROUTES 44 /* current number of routes */ /* via router advertisement */ -/* New entries should be added here from current IPV6CTL_MAXID value. */ -/* to define items, should talk with KAME guys first, for *BSD compatibility */ -#define IPV6CTL_MAXID 45 - -#define IPV6CTL_NAMES { \ - { 0, 0 }, \ - { "forwarding", CTLTYPE_INT }, \ - { "redirect", CTLTYPE_INT }, \ - { "hlim", CTLTYPE_INT }, \ - { "mtu", CTLTYPE_INT }, \ - { "forwsrcrt", CTLTYPE_INT }, \ - { "stats", CTLTYPE_STRUCT }, \ - { 0, 0 }, \ - { "mrtproto", CTLTYPE_INT }, \ - { "maxfragpackets", CTLTYPE_INT }, \ - { "sourcecheck", CTLTYPE_INT }, \ - { "sourcecheck_logint", CTLTYPE_INT }, \ - { "accept_rtadv", CTLTYPE_INT }, \ - { "keepfaith", CTLTYPE_INT }, \ - { "log_interval", CTLTYPE_INT }, \ - { "hdrnestlimit", CTLTYPE_INT }, \ - { "dad_count", CTLTYPE_INT }, \ - { "auto_flowlabel", CTLTYPE_INT }, \ - { "defmcasthlim", CTLTYPE_INT }, \ - { "gifhlim", CTLTYPE_INT }, \ - { "kame_version", CTLTYPE_STRING }, \ - { "use_deprecated", CTLTYPE_INT }, \ - { "rr_prune", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "v6only", CTLTYPE_INT }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "anonportmin", CTLTYPE_INT }, \ - { "anonportmax", CTLTYPE_INT }, \ - { "lowportmin", CTLTYPE_INT }, \ - { "lowportmax", CTLTYPE_INT }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "maxfrags", CTLTYPE_INT }, \ - { "ifq", CTLTYPE_NODE }, \ - { "rtadv_maxroutes", CTLTYPE_INT }, \ - { "rtadv_numroutes", CTLTYPE_INT }, \ -} - #endif /* _NETBSD_SOURCE */ #ifdef _KERNEL Index: src/sys/netinet6/pim6_var.h diff -u src/sys/netinet6/pim6_var.h:1.14 src/sys/netinet6/pim6_var.h:1.15 --- src/sys/netinet6/pim6_var.h:1.14 Tue Apr 15 05:40:15 2008 +++ src/sys/netinet6/pim6_var.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: pim6_var.h,v 1.14 2008/04/15 05:40:15 thorpej Exp $ */ +/* $NetBSD: pim6_var.h,v 1.15 2018/08/22 01:05:24 msaitoh Exp $ */ /* $KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $ */ /* @@ -60,10 +60,5 @@ int pim6_input(struct mbuf **, int*, int * Names for PIM sysctl objects */ #define PIM6CTL_STATS 1 /* statistics (read-only) */ -#define PIM6CTL_MAXID 2 -#define PIM6CTL_NAMES { \ - { 0, 0 }, \ - { "stats", CTLTYPE_STRUCT }, \ -} #endif /* !_NETINET6_PIM6_VAR_H_ */ Index: src/sys/netinet6/raw_ip6.h diff -u src/sys/netinet6/raw_ip6.h:1.4 src/sys/netinet6/raw_ip6.h:1.5 --- src/sys/netinet6/raw_ip6.h:1.4 Tue Apr 15 05:13:37 2008 +++ src/sys/netinet6/raw_ip6.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: raw_ip6.h,v 1.4 2008/04/15 05:13:37 thorpej Exp $ */ +/* $NetBSD: raw_ip6.h,v 1.5 2018/08/22 01:05:24 msaitoh Exp $ */ /* $KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $ */ /* @@ -50,12 +50,6 @@ * Names for Raw IPv6 sysctl objects */ #define RAW6CTL_STATS 1 -#define RAW6CTL_MAXID 2 - -#define RAW6CTL_NAMES { \ - { 0, 0 }, \ - { "stats", CTLTYPE_STRUCT }, \ -} #ifdef _KERNEL extern struct rip6stat rip6stat; Index: src/sys/netinet6/udp6_var.h diff -u src/sys/netinet6/udp6_var.h:1.28 src/sys/netinet6/udp6_var.h:1.29 --- src/sys/netinet6/udp6_var.h:1.28 Sat May 2 17:18:03 2015 +++ src/sys/netinet6/udp6_var.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: udp6_var.h,v 1.28 2015/05/02 17:18:03 rtr Exp $ */ +/* $NetBSD: udp6_var.h,v 1.29 2018/08/22 01:05:24 msaitoh Exp $ */ /* $KAME: udp6_var.h,v 1.11 2000/06/05 00:14:31 itojun Exp $ */ /* @@ -88,15 +88,6 @@ #define UDP6CTL_RECVSPACE 2 /* default recv buffer */ #define UDP6CTL_LOOPBACKCKSUM 3 /* do UDP checksum on loopback? */ #define UDP6CTL_STATS 4 /* udp6 statistics */ -#define UDP6CTL_MAXID 5 - -#define UDP6CTL_NAMES { \ - { 0, 0 }, \ - { "sendspace", CTLTYPE_INT }, \ - { "recvspace", CTLTYPE_INT }, \ - { "do_loopback_cksum", CTLTYPE_INT }, \ - { "stats", CTLTYPE_STRUCT }, \ -} #ifdef _KERNEL Index: src/sys/netipsec/ipsec_var.h diff -u src/sys/netipsec/ipsec_var.h:1.7 src/sys/netipsec/ipsec_var.h:1.8 --- src/sys/netipsec/ipsec_var.h:1.7 Sat Apr 28 13:23:17 2018 +++ src/sys/netipsec/ipsec_var.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec_var.h,v 1.7 2018/04/28 13:23:17 maxv Exp $ */ +/* $NetBSD: ipsec_var.h,v 1.8 2018/08/22 01:05:24 msaitoh Exp $ */ /* $FreeBSD: ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */ /*- @@ -73,6 +73,5 @@ #define IPSECCTL_ECN 11 #define IPSECCTL_DEBUG 12 #define IPSECCTL_ESP_RANDPAD 13 -#define IPSECCTL_MAXID 14 #endif /* !_NETIPSEC_IPSEC_VAR_H_ */ Index: src/sys/nfs/nfs.h diff -u src/sys/nfs/nfs.h:1.77 src/sys/nfs/nfs.h:1.78 --- src/sys/nfs/nfs.h:1.77 Thu Jan 25 17:14:36 2018 +++ src/sys/nfs/nfs.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs.h,v 1.77 2018/01/25 17:14:36 riastradh Exp $ */ +/* $NetBSD: nfs.h,v 1.78 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1989, 1993, 1995 * The Regents of the University of California. All rights reserved. @@ -291,13 +291,6 @@ struct nfsstats { */ #define NFS_NFSSTATS 1 /* struct: struct nfsstats */ #define NFS_IOTHREADS 2 /* number of io threads */ -#define NFS_MAXID 3 - -#define NFS_NAMES { \ - { 0, 0 }, \ - { "nfsstats", CTLTYPE_STRUCT }, \ - { "iothreads", CTLTYPE_INT }, \ -} /* * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts. Index: src/sys/sys/mbuf.h diff -u src/sys/sys/mbuf.h:1.209 src/sys/sys/mbuf.h:1.210 --- src/sys/sys/mbuf.h:1.209 Thu Aug 9 17:43:54 2018 +++ src/sys/sys/mbuf.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: mbuf.h,v 1.209 2018/08/09 17:43:54 maxv Exp $ */ +/* $NetBSD: mbuf.h,v 1.210 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc. @@ -748,18 +748,6 @@ struct mbstat_cpu { #define MBUF_MCLLOWAT 5 /* int: mbuf cluster low water mark */ #define MBUF_STATS 6 /* struct: mbstat */ #define MBUF_MOWNERS 7 /* struct: m_owner[] */ -#define MBUF_MAXID 8 /* number of valid MBUF ids */ - -#define CTL_MBUF_NAMES { \ - { 0, 0 }, \ - { "msize", CTLTYPE_INT }, \ - { "mclbytes", CTLTYPE_INT }, \ - { "nmbclusters", CTLTYPE_INT }, \ - { "mblowat", CTLTYPE_INT }, \ - { "mcllowat", CTLTYPE_INT }, \ - { 0 /* "stats" */, CTLTYPE_STRUCT }, \ - { 0 /* "mowners" */, CTLTYPE_STRUCT }, \ -} #ifdef _KERNEL extern struct mbstat mbstat; Index: src/sys/sys/mount.h diff -u src/sys/sys/mount.h:1.230 src/sys/sys/mount.h:1.231 --- src/sys/sys/mount.h:1.230 Tue Jan 9 03:31:13 2018 +++ src/sys/sys/mount.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: mount.h,v 1.230 2018/01/09 03:31:13 christos Exp $ */ +/* $NetBSD: mount.h,v 1.231 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1989, 1991, 1993 @@ -115,7 +115,6 @@ as next argument */ #define VFS_USERMOUNT 3 /* enable/disable fs mnt by non-root */ #define VFS_MAGICLINKS 4 /* expand 'magic' symlinks */ -#define VFSGEN_MAXID 5 /* number of valid vfs.generic ids */ /* vfsquery flags for kqueue(2) */ #define VQ_MOUNT 0x0001 /* new filesystem arrived */ @@ -163,45 +162,6 @@ struct mount { #ifdef _KERNEL -/* - * USE THE SAME NAMES AS MOUNT_*! - * - * Only need to add new entry here if the filesystem actually supports - * sysctl(2). - */ -#define CTL_VFS_NAMES { \ - { "generic", CTLTYPE_NODE }, \ - { MOUNT_FFS, CTLTYPE_NODE }, \ - { MOUNT_NFS, CTLTYPE_NODE }, \ - { MOUNT_MFS, CTLTYPE_NODE }, \ - { MOUNT_MSDOS, CTLTYPE_NODE }, \ - { MOUNT_LFS, CTLTYPE_NODE }, \ - { 0, 0 }, /* MOUNT_LOFS */ \ - { MOUNT_FDESC, CTLTYPE_NODE }, \ - { MOUNT_NULL, CTLTYPE_NODE }, \ - { MOUNT_UMAP, CTLTYPE_NODE }, \ - { MOUNT_KERNFS, CTLTYPE_NODE }, \ - { MOUNT_PROCFS, CTLTYPE_NODE }, \ - { MOUNT_AFS, CTLTYPE_NODE }, \ - { MOUNT_CD9660, CTLTYPE_NODE }, \ - { MOUNT_UNION, CTLTYPE_NODE }, \ - { MOUNT_ADOSFS, CTLTYPE_NODE }, \ - { MOUNT_EXT2FS, CTLTYPE_NODE }, \ - { MOUNT_CODA, CTLTYPE_NODE }, \ - { MOUNT_FILECORE, CTLTYPE_NODE }, \ - { MOUNT_NTFS, CTLTYPE_NODE }, \ -} - -#define VFS_MAXID 20 /* number of valid vfs ids */ - -#define CTL_VFSGENCTL_NAMES { \ - { 0, 0 }, \ - { "maxtypenum", CTLTYPE_INT }, \ - { "conf", CTLTYPE_NODE }, /* Special */ \ - { "usermount", CTLTYPE_INT }, \ - { "magiclinks", CTLTYPE_INT }, \ -} - struct quotactl_args; /* in sys/quotactl.h */ struct quotastat; /* in sys/quotactl.h */ struct quotaidtypestat; /* in sys/quotactl.h */ Index: src/sys/sys/pipe.h diff -u src/sys/sys/pipe.h:1.35 src/sys/sys/pipe.h:1.36 --- src/sys/sys/pipe.h:1.35 Sun Jun 10 17:54:51 2018 +++ src/sys/sys/pipe.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: pipe.h,v 1.35 2018/06/10 17:54:51 jdolecek Exp $ */ +/* $NetBSD: pipe.h,v 1.36 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -128,16 +128,6 @@ struct pipe { #define KERN_PIPE_MAXBIGPIPES 3 /* maximum # of "big" pipes */ #define KERN_PIPE_NBIGPIPES 4 /* current number of "big" p. */ #define KERN_PIPE_KVASIZE 5 /* current pipe kva size */ -#define KERN_PIPE_MAXID 6 - -#define CTL_PIPE_NAMES { \ - { 0, 0 }, \ - { "maxkvasz", CTLTYPE_INT }, \ - { "maxloankvasz", CTLTYPE_INT }, \ - { "maxbigpipes", CTLTYPE_INT }, \ - { "nbigpipes", CTLTYPE_INT }, \ - { "kvasize", CTLTYPE_INT }, \ -} #ifdef _KERNEL int sysctl_dopipe(int *, u_int, void *, size_t *, void *, size_t); Index: src/sys/sys/socket.h diff -u src/sys/sys/socket.h:1.126 src/sys/sys/socket.h:1.127 --- src/sys/sys/socket.h:1.126 Tue Jul 31 13:20:34 2018 +++ src/sys/sys/socket.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: socket.h,v 1.126 2018/07/31 13:20:34 rjs Exp $ */ +/* $NetBSD: socket.h,v 1.127 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -385,43 +385,6 @@ struct sockcred { * * Further levels are defined by the individual families below. */ -#define NET_MAXID AF_MAX - -#define CTL_NET_NAMES { \ - { 0, 0 }, \ - { "local", CTLTYPE_NODE }, \ - { "inet", CTLTYPE_NODE }, \ - { "implink", CTLTYPE_NODE }, \ - { "pup", CTLTYPE_NODE }, \ - { "chaos", CTLTYPE_NODE }, \ - { "xerox_ns", CTLTYPE_NODE }, \ - { "iso", CTLTYPE_NODE }, \ - { "emca", CTLTYPE_NODE }, \ - { "datakit", CTLTYPE_NODE }, \ - { "ccitt", CTLTYPE_NODE }, \ - { "ibm_sna", CTLTYPE_NODE }, \ - { "decnet", CTLTYPE_NODE }, \ - { "dec_dli", CTLTYPE_NODE }, \ - { "lat", CTLTYPE_NODE }, \ - { "hylink", CTLTYPE_NODE }, \ - { "appletalk", CTLTYPE_NODE }, \ - { "oroute", CTLTYPE_NODE }, \ - { "link_layer", CTLTYPE_NODE }, \ - { "xtp", CTLTYPE_NODE }, \ - { "coip", CTLTYPE_NODE }, \ - { "cnt", CTLTYPE_NODE }, \ - { "rtip", CTLTYPE_NODE }, \ - { "ipx", CTLTYPE_NODE }, \ - { "inet6", CTLTYPE_NODE }, \ - { "pip", CTLTYPE_NODE }, \ - { "isdn", CTLTYPE_NODE }, \ - { "natm", CTLTYPE_NODE }, \ - { "arp", CTLTYPE_NODE }, \ - { "key", CTLTYPE_NODE }, \ - { "ieee80211", CTLTYPE_NODE }, \ - { "mlps", CTLTYPE_NODE }, \ - { "route", CTLTYPE_NODE }, \ -} struct kinfo_pcb { __uint64_t ki_pcbaddr; /* PTR: pcb addr */ @@ -482,16 +445,7 @@ struct kinfo_pcb { #define NET_RT_OOIFLIST 4 /* old NET_RT_IFLIST (pre-64bit time) */ #define NET_RT_OIFLIST 5 /* old NET_RT_IFLIST (pre 8.0) */ #define NET_RT_IFLIST 6 /* survey interface list */ -#define NET_RT_MAXID 7 -#define CTL_NET_RT_NAMES { \ - { 0, 0 }, \ - { "dump", CTLTYPE_STRUCT }, \ - { "flags", CTLTYPE_STRUCT }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "iflist", CTLTYPE_STRUCT }, \ -} #endif /* _NETBSD_SOURCE */ /* Index: src/sys/sys/sysctl.h diff -u src/sys/sys/sysctl.h:1.227 src/sys/sys/sysctl.h:1.228 --- src/sys/sys/sysctl.h:1.227 Sat Aug 11 11:33:10 2018 +++ src/sys/sys/sysctl.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: sysctl.h,v 1.227 2018/08/11 11:33:10 kamil Exp $ */ +/* $NetBSD: sysctl.h,v 1.228 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1989, 1993 @@ -180,7 +180,6 @@ struct ctlname { #define CTL_VENDOR 11 /* vendor-specific data */ #define CTL_EMUL 12 /* emulation-specific data */ #define CTL_SECURITY 13 /* security */ -#define CTL_MAXID 14 /* number of valid top-level ids */ /* * The "vendor" toplevel name is to be used by vendors who wish to @@ -275,96 +274,6 @@ struct ctlname { #define KERN_SYSVIPC 82 /* node: SysV IPC parameters */ #define KERN_BOOTTIME 83 /* struct: time kernel was booted */ #define KERN_EVCNT 84 /* struct: evcnts */ -#define KERN_MAXID 85 /* number of valid kern ids */ - - -#define CTL_KERN_NAMES { \ - { 0, 0 }, \ - { "ostype", CTLTYPE_STRING }, \ - { "osrelease", CTLTYPE_STRING }, \ - { "osrevision", CTLTYPE_INT }, \ - { "version", CTLTYPE_STRING }, \ - { "maxvnodes", CTLTYPE_INT }, \ - { "maxproc", CTLTYPE_INT }, \ - { "maxfiles", CTLTYPE_INT }, \ - { "argmax", CTLTYPE_INT }, \ - { "securelevel", CTLTYPE_INT }, \ - { "hostname", CTLTYPE_STRING }, \ - { "hostid", CTLTYPE_INT }, \ - { "clockrate", CTLTYPE_STRUCT }, \ - { "vnode", CTLTYPE_STRUCT }, \ - { "proc", CTLTYPE_STRUCT }, \ - { "file", CTLTYPE_STRUCT }, \ - { "profiling", CTLTYPE_NODE }, \ - { "posix1version", CTLTYPE_INT }, \ - { "ngroups", CTLTYPE_INT }, \ - { "job_control", CTLTYPE_INT }, \ - { "saved_ids", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "domainname", CTLTYPE_STRING }, \ - { "maxpartitions", CTLTYPE_INT }, \ - { "rawpartition", CTLTYPE_INT }, \ - { "ntptime", CTLTYPE_STRUCT }, \ - { "timex", CTLTYPE_STRUCT }, \ - { "autonicetime", CTLTYPE_INT }, \ - { "autoniceval", CTLTYPE_INT }, \ - { "rtc_offset", CTLTYPE_INT }, \ - { "root_device", CTLTYPE_STRING }, \ - { "msgbufsize", CTLTYPE_INT }, \ - { "fsync", CTLTYPE_INT }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { 0, 0 }, \ - { "synchronized_io", CTLTYPE_INT }, \ - { "iov_max", CTLTYPE_INT }, \ - { "mbuf", CTLTYPE_NODE }, \ - { "mapped_files", CTLTYPE_INT }, \ - { "memlock", CTLTYPE_INT }, \ - { "memlock_range", CTLTYPE_INT }, \ - { "memory_protection", CTLTYPE_INT }, \ - { "login_name_max", CTLTYPE_INT }, \ - { "defcorename", CTLTYPE_STRING }, \ - { "logsigexit", CTLTYPE_INT }, \ - { "proc2", CTLTYPE_STRUCT }, \ - { "proc_args", CTLTYPE_STRING }, \ - { "fscale", CTLTYPE_INT }, \ - { 0, 0 }, \ - { "cp_time", CTLTYPE_STRUCT }, \ - { 0, 0 }, \ - { "msgbuf", CTLTYPE_STRUCT }, \ - { "consdev", CTLTYPE_STRUCT }, \ - { "maxptys", CTLTYPE_INT }, \ - { "pipe", CTLTYPE_NODE }, \ - { "maxphys", CTLTYPE_INT }, \ - { "sbmax", CTLTYPE_INT }, \ - { "tkstat", CTLTYPE_NODE }, \ - { "monotonic_clock", CTLTYPE_INT }, \ - { "urandom", CTLTYPE_INT }, \ - { "labelsector", CTLTYPE_INT }, \ - { "labeloffset", CTLTYPE_INT }, \ - { "lwp", CTLTYPE_STRUCT }, \ - { "forkfsleep", CTLTYPE_INT }, \ - { "posix_threads", CTLTYPE_INT }, \ - { "posix_semaphores", CTLTYPE_INT }, \ - { "posix_barriers", CTLTYPE_INT }, \ - { "posix_timers", CTLTYPE_INT }, \ - { "posix_spin_locks", CTLTYPE_INT }, \ - { "posix_reader_writer_locks", CTLTYPE_INT }, \ - { "dump_on_panic", CTLTYPE_INT}, \ - { "somaxkva", CTLTYPE_INT}, \ - { "root_partition", CTLTYPE_INT}, \ - { "drivers", CTLTYPE_STRUCT }, \ - { "buf", CTLTYPE_NODE }, \ - { "file2", CTLTYPE_STRUCT }, \ - { "veriexec", CTLTYPE_NODE }, \ - { "cp_id", CTLTYPE_STRUCT }, \ - { "hardclock_ticks", CTLTYPE_INT }, \ - { "arandom", CTLTYPE_STRUCT }, \ - { "sysvipc", CTLTYPE_STRUCT }, \ - { "boottime", CTLTYPE_STRUCT }, \ - { "evcnt", CTLTYPE_STRUCT }, \ -} /* * KERN_CLOCKRATE structure @@ -707,15 +616,6 @@ struct kinfo_lwp { #define KERN_TKSTAT_NOUT 2 /* total output character */ #define KERN_TKSTAT_CANCC 3 /* canonical input character */ #define KERN_TKSTAT_RAWCC 4 /* raw input character */ -#define KERN_TKSTAT_MAXID 5 /* number of valid TKSTAT ids */ - -#define KERN_TKSTAT_NAMES { \ - { 0, 0 }, \ - { "nin", CTLTYPE_QUAD }, \ - { "nout", CTLTYPE_QUAD }, \ - { "cancc", CTLTYPE_QUAD }, \ - { "rawcc", CTLTYPE_QUAD }, \ -} /* * kern.drivers returns an array of these. @@ -902,28 +802,8 @@ struct kinfo_vmentry { #define HW_PHYSMEM64 13 /* quad: total memory (bytes) */ #define HW_USERMEM64 14 /* quad: non-kernel memory (bytes) */ #define HW_IOSTATNAMES 15 /* string: iostat names */ -#define HW_MAXID 15 /* number of valid hw ids */ #define HW_NCPUONLINE 16 /* number CPUs online */ -#define CTL_HW_NAMES { \ - { 0, 0 }, \ - { "machine", CTLTYPE_STRING }, \ - { "model", CTLTYPE_STRING }, \ - { "ncpu", CTLTYPE_INT }, \ - { "byteorder", CTLTYPE_INT }, \ - { "physmem", CTLTYPE_INT }, \ - { "usermem", CTLTYPE_INT }, \ - { "pagesize", CTLTYPE_INT }, \ - { "drivenames", CTLTYPE_STRING }, \ - { "drivestats", CTLTYPE_STRUCT }, \ - { "machine_arch", CTLTYPE_STRING }, \ - { "alignbytes", CTLTYPE_INT }, \ - { "cnmagic", CTLTYPE_STRING }, \ - { "physmem64", CTLTYPE_QUAD }, \ - { "usermem64", CTLTYPE_QUAD }, \ - { "ncpuonline", CTLTYPE_INT }, \ -} - /* * CTL_USER definitions */ @@ -948,32 +828,6 @@ struct kinfo_vmentry { #define USER_STREAM_MAX 19 /* int: POSIX2_STREAM_MAX */ #define USER_TZNAME_MAX 20 /* int: _POSIX_TZNAME_MAX */ #define USER_ATEXIT_MAX 21 /* int: {ATEXIT_MAX} */ -#define USER_MAXID 22 /* number of valid user ids */ - -#define CTL_USER_NAMES { \ - { 0, 0 }, \ - { "cs_path", CTLTYPE_STRING }, \ - { "bc_base_max", CTLTYPE_INT }, \ - { "bc_dim_max", CTLTYPE_INT }, \ - { "bc_scale_max", CTLTYPE_INT }, \ - { "bc_string_max", CTLTYPE_INT }, \ - { "coll_weights_max", CTLTYPE_INT }, \ - { "expr_nest_max", CTLTYPE_INT }, \ - { "line_max", CTLTYPE_INT }, \ - { "re_dup_max", CTLTYPE_INT }, \ - { "posix2_version", CTLTYPE_INT }, \ - { "posix2_c_bind", CTLTYPE_INT }, \ - { "posix2_c_dev", CTLTYPE_INT }, \ - { "posix2_char_term", CTLTYPE_INT }, \ - { "posix2_fort_dev", CTLTYPE_INT }, \ - { "posix2_fort_run", CTLTYPE_INT }, \ - { "posix2_localedef", CTLTYPE_INT }, \ - { "posix2_sw_dev", CTLTYPE_INT }, \ - { "posix2_upe", CTLTYPE_INT }, \ - { "stream_max", CTLTYPE_INT }, \ - { "tzname_max", CTLTYPE_INT }, \ - { "atexit_max", CTLTYPE_INT }, \ -} /* * CTL_DDB definitions @@ -985,18 +839,6 @@ struct kinfo_vmentry { #define DDBCTL_TABSTOPS 5 /* int: tab width */ #define DDBCTL_ONPANIC 6 /* int: DDB on panic if non-zero */ #define DDBCTL_FROMCONSOLE 7 /* int: DDB via console if non-zero */ -#define DDBCTL_MAXID 8 /* number of valid DDB ids */ - -#define CTL_DDB_NAMES { \ - { 0, 0 }, \ - { "radix", CTLTYPE_INT }, \ - { "maxoff", CTLTYPE_INT }, \ - { "maxwidth", CTLTYPE_INT }, \ - { "lines", CTLTYPE_INT }, \ - { "tabstops", CTLTYPE_INT }, \ - { "onpanic", CTLTYPE_INT }, \ - { "fromconsole", CTLTYPE_INT }, \ -} /* * CTL_DEBUG definitions @@ -1006,7 +848,6 @@ struct kinfo_vmentry { */ #define CTL_DEBUG_NAME 0 /* string: variable name */ #define CTL_DEBUG_VALUE 1 /* int: variable value */ -#define CTL_DEBUG_MAXID 20 /* * CTL_PROC subtype. Either a PID, or a magic value for the current proc. @@ -1025,17 +866,6 @@ struct kinfo_vmentry { #define PROC_PID_STOPEXEC 4 #define PROC_PID_STOPEXIT 5 #define PROC_PID_PAXFLAGS 6 -#define PROC_PID_MAXID 7 - -#define PROC_PID_NAMES { \ - { 0, 0 }, \ - { "corename", CTLTYPE_STRING }, \ - { "rlimit", CTLTYPE_NODE }, \ - { "stopfork", CTLTYPE_INT }, \ - { "stopexec", CTLTYPE_INT }, \ - { "stopexit", CTLTYPE_INT }, \ - { "paxflags", CTLTYPE_INT }, \ -} /* Limit types from <sys/resources.h> */ #define PROC_PID_LIMIT_CPU (RLIMIT_CPU+1) @@ -1050,33 +880,10 @@ struct kinfo_vmentry { #define PROC_PID_LIMIT_SBSIZE (RLIMIT_SBSIZE+1) #define PROC_PID_LIMIT_AS (RLIMIT_AS+1) #define PROC_PID_LIMIT_NTHR (RLIMIT_NTHR+1) -#define PROC_PID_LIMIT_MAXID (RLIM_NLIMITS+1) -#define PROC_PID_LIMIT_NAMES { \ - { 0, 0 }, \ - { "cputime", CTLTYPE_NODE }, \ - { "filesize", CTLTYPE_NODE }, \ - { "datasize", CTLTYPE_NODE }, \ - { "stacksize", CTLTYPE_NODE }, \ - { "coredumpsize", CTLTYPE_NODE }, \ - { "memoryuse", CTLTYPE_NODE }, \ - { "memorylocked", CTLTYPE_NODE }, \ - { "maxproc", CTLTYPE_NODE }, \ - { "descriptors", CTLTYPE_NODE }, \ - { "sbsize", CTLTYPE_NODE }, \ - { "vmemoryuse", CTLTYPE_NODE }, \ - { "maxlwp", CTLTYPE_NODE }, \ -} /* for each type, either hard or soft value */ #define PROC_PID_LIMIT_TYPE_SOFT 1 #define PROC_PID_LIMIT_TYPE_HARD 2 -#define PROC_PID_LIMIT_TYPE_MAXID 3 - -#define PROC_PID_LIMIT_TYPE_NAMES { \ - {0, 0}, \ - { "soft", CTLTYPE_QUAD }, \ - { "hard", CTLTYPE_QUAD }, \ -} /* * Export PAX flag definitions to userland. @@ -1097,8 +904,6 @@ struct kinfo_vmentry { #define EMUL_LINUX 1 #define EMUL_LINUX32 5 -#define EMUL_MAXID 6 - #ifdef _KERNEL #if defined(_KERNEL_OPT) Index: src/sys/ufs/ffs/ffs_extern.h diff -u src/sys/ufs/ffs/ffs_extern.h:1.84 src/sys/ufs/ffs/ffs_extern.h:1.85 --- src/sys/ufs/ffs/ffs_extern.h:1.84 Thu Feb 9 04:37:35 2017 +++ src/sys/ufs/ffs/ffs_extern.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_extern.h,v 1.84 2017/02/09 04:37:35 kre Exp $ */ +/* $NetBSD: ffs_extern.h,v 1.85 2018/08/22 01:05:24 msaitoh Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -43,7 +43,6 @@ #define FFS_ASYNCFREE 4 /* asynchronous block freeing enabled */ #define FFS_LOG_CHANGEOPT 5 /* log optimalization strategy change */ #define FFS_EXTATTR_AUTOCREATE 6 /* size for backing file autocreation */ -#define FFS_MAXID 7 /* number of valid ffs ids */ struct buf; struct fid; Index: src/sys/ufs/lfs/lfs_extern.h diff -u src/sys/ufs/lfs/lfs_extern.h:1.113 src/sys/ufs/lfs/lfs_extern.h:1.114 --- src/sys/ufs/lfs/lfs_extern.h:1.113 Wed Jul 26 16:42:37 2017 +++ src/sys/ufs/lfs/lfs_extern.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_extern.h,v 1.113 2017/07/26 16:42:37 maya Exp $ */ +/* $NetBSD: lfs_extern.h,v 1.114 2018/08/22 01:05:24 msaitoh Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -83,7 +83,6 @@ MALLOC_DECLARE(M_SEGMENT); #define LFS_DO_RFW 7 #define LFS_DEBUGLOG 8 #define LFS_IGNORE_LAZY_SYNC 9 -#define LFS_MAXID 10 /* not ours */ struct fid; Index: src/sys/uvm/uvm_param.h diff -u src/sys/uvm/uvm_param.h:1.37 src/sys/uvm/uvm_param.h:1.38 --- src/sys/uvm/uvm_param.h:1.37 Sun Jul 2 16:41:33 2017 +++ src/sys/uvm/uvm_param.h Wed Aug 22 01:05:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_param.h,v 1.37 2017/07/02 16:41:33 joerg Exp $ */ +/* $NetBSD: uvm_param.h,v 1.38 2018/08/22 01:05:24 msaitoh Exp $ */ /* * Copyright (c) 1991, 1993 @@ -181,32 +181,8 @@ extern const int *const uvmexp_pageshift #define VM_GUARD_SIZE 17 /* guard size for main thread */ #define VM_THREAD_GUARD_SIZE 18 /* default guard size for new threads */ -#define VM_MAXID 17 /* number of valid vm ids */ - #define VM_PROC_MAP 1 /* struct kinfo_vmentry */ -#define CTL_VM_NAMES { \ - { 0, 0 }, \ - { "vmmeter", CTLTYPE_STRUCT }, \ - { "loadavg", CTLTYPE_STRUCT }, \ - { "uvmexp", CTLTYPE_STRUCT }, \ - { "nkmempages", CTLTYPE_INT }, \ - { "uvmexp2", CTLTYPE_STRUCT }, \ - { "anonmin", CTLTYPE_INT }, \ - { "execmin", CTLTYPE_INT }, \ - { "filemin", CTLTYPE_INT }, \ - { "maxslp", CTLTYPE_INT }, \ - { "uspace", CTLTYPE_INT }, \ - { "anonmax", CTLTYPE_INT }, \ - { "execmax", CTLTYPE_INT }, \ - { "filemax", CTLTYPE_INT }, \ - { "minaddress", CTLTYPE_LONG }, \ - { "maxaddress", CTLTYPE_LONG }, \ - { "proc", CTLTYPE_STRUCT }, \ - { "guard_size", CTLTYPE_INT }, \ - { "thread_guard_size", CTLTYPE_INT }, \ -} - #ifndef ASSEMBLER /* * Convert addresses to pages and vice versa.