summaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorEric Andersen2005-09-12 21:42:48 +0000
committerEric Andersen2005-09-12 21:42:48 +0000
commit5d38f5ba898c276759f1e404455aad1f3073e730 (patch)
tree1b646fcf1fccf02a0559c01eb115580082e22e71 /procps
parent2c6b41812febab045917c0be15ff8427191df0f4 (diff)
downloadbusybox-5d38f5ba898c276759f1e404455aad1f3073e730.zip
busybox-5d38f5ba898c276759f1e404455aad1f3073e730.tar.gz
sysctl was seriously broken. And since in some cases 'CONFIG_SYSCTL'
could be included into application space via the kernel config option of the same name, nasty compilation problems could result.
Diffstat (limited to 'procps')
-rw-r--r--procps/Config.in2
-rw-r--r--procps/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/procps/Config.in b/procps/Config.in
index 8d55797..7672582 100644
--- a/procps/Config.in
+++ b/procps/Config.in
@@ -72,7 +72,7 @@ config CONFIG_UPTIME
the system has been running, how many users are currently logged
on, and the system load averages for the past 1, 5, and 15 minutes.
-config CONFIG_SYSCTL
+config CONFIG_BB_SYSCTL
bool "sysctl"
default n
help
diff --git a/procps/Makefile.in b/procps/Makefile.in
index b9eb117..5207b80 100644
--- a/procps/Makefile.in
+++ b/procps/Makefile.in
@@ -29,7 +29,7 @@ PROCPS-$(CONFIG_KILL) += kill.o
PROCPS-$(CONFIG_PIDOF) += pidof.o
PROCPS-$(CONFIG_PS) += ps.o
PROCPS-$(CONFIG_RENICE) += renice.o
-PROCPS-$(CONFIG_SYSCTL) += sysctl.o
+PROCPS-$(CONFIG_BB_SYSCTL) += sysctl.o
PROCPS-$(CONFIG_TOP) += top.o
PROCPS-$(CONFIG_UPTIME) += uptime.o