Tue Apr 26 21:27:44 2011 UTC ()
Kill CTL_EMUL_NAMES.


(joerg)
diff -r1.194 -r1.195 src/sys/sys/sysctl.h
cvs diff -r1.194 -r1.195 src/sys/sys/sysctl.h (expand / switch to unified diff)

--- src/sys/sys/sysctl.h 2011/04/26 16:36:43 1.194
+++ src/sys/sys/sysctl.h 2011/04/26 21:27:44 1.195
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: sysctl.h,v 1.194 2011/04/26 16:36:43 joerg Exp $ */ 1/* $NetBSD: sysctl.h,v 1.195 2011/04/26 21:27:44 joerg Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1989, 1993 4 * Copyright (c) 1989, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Mike Karels at Berkeley Software Design, Inc. 8 * Mike Karels at Berkeley Software Design, Inc.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -996,31 +996,26 @@ struct evcnt_sysctl { @@ -996,31 +996,26 @@ struct evcnt_sysctl {
996 { "hard", CTLTYPE_QUAD }, \ 996 { "hard", CTLTYPE_QUAD }, \
997} 997}
998 998
999/* 999/*
1000 * CTL_EMUL definitions 1000 * CTL_EMUL definitions
1001 * 1001 *
1002 * Second level identifier specifies which emulation variable. 1002 * Second level identifier specifies which emulation variable.
1003 * Subsequent levels are specified in the emulations themselves. 1003 * Subsequent levels are specified in the emulations themselves.
1004 */ 1004 */
1005#define EMUL_LINUX 1 1005#define EMUL_LINUX 1
1006#define EMUL_LINUX32 5 1006#define EMUL_LINUX32 5
1007 1007
1008#define EMUL_MAXID 6 1008#define EMUL_MAXID 6
1009#define CTL_EMUL_NAMES { \ 
1010 { 0, 0 }, \ 
1011 { "linux", CTLTYPE_NODE }, \ 
1012 { "linux32", CTLTYPE_NODE }, \ 
1013} 
1014 1009
1015#ifdef _KERNEL 1010#ifdef _KERNEL
1016 1011
1017#if defined(_KERNEL_OPT) 1012#if defined(_KERNEL_OPT)
1018#include "opt_sysctl.h" 1013#include "opt_sysctl.h"
1019#endif 1014#endif
1020 1015
1021/* Root node of the kernel sysctl tree */ 1016/* Root node of the kernel sysctl tree */
1022extern struct sysctlnode sysctl_root; 1017extern struct sysctlnode sysctl_root;
1023 1018
1024/* 1019/*
1025 * A log of nodes created by a setup function or set of setup 1020 * A log of nodes created by a setup function or set of setup
1026 * functions so that they can be torn down in one "transaction" 1021 * functions so that they can be torn down in one "transaction"