diff --git a/[refs] b/[refs] index 96481bf70341..7bd2af784572 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b402f06d6e31b8c3c74bfc3e7d2e292dd4a1b90a +refs/heads/master: 50d851f7227cf9e7fcc4cd1d2b3c72ddd64c50e6 diff --git a/trunk/include/linux/sunrpc/debug.h b/trunk/include/linux/sunrpc/debug.h index 60fce3c92857..b7c7307ceec6 100644 --- a/trunk/include/linux/sunrpc/debug.h +++ b/trunk/include/linux/sunrpc/debug.h @@ -78,7 +78,6 @@ void rpc_unregister_sysctl(void); * module currently registers its sysctl table dynamically, the sysctl path * for module FOO is . */ -#define CTL_SUNRPC 7249 /* arbitrary and hopefully unused */ enum { CTL_RPCDEBUG = 1, diff --git a/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h index 665412c4f4b9..23a8f3c8bd7e 100644 --- a/trunk/include/linux/sysctl.h +++ b/trunk/include/linux/sysctl.h @@ -69,7 +69,8 @@ enum CTL_DEV=7, /* Devices */ CTL_BUS=8, /* Busses */ CTL_ABI=9, /* Binary emulation */ - CTL_CPU=10 /* CPU stuff (speed scaling, etc) */ + CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ + CTL_SUNRPC=7249, /* sunrpc debug */ }; /* CTL_BUS names: */