2006-11-27 Dmitry V. Levin <ldv@altlinux.org>

	* system.c [LINUX]: Define CTL_PROC, since Linux 2.6.18+ headers
	removed CTL_PROC enum.	Patch from Jakub Jelinek.
	[LINUX] (sysctl_root): Add CTL_BUS, CTL_ABI and CTL_CPU.

diff --git a/ChangeLog b/ChangeLog
index 48fe1ded27c46f64b49af696746d1367390e380e..f7c87dcd5e3cd3ee411942d24f5c39d55e1856e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-27  Dmitry V. Levin  <ldv@altlinux.org>
+
+       * system.c [LINUX]: Define CTL_PROC, since Linux 2.6.18+ headers
+       removed CTL_PROC enum.  Patch from Jakub Jelinek.
+       [LINUX] (sysctl_root): Add CTL_BUS, CTL_ABI and CTL_CPU.
+
 2006-11-20  Jakub Jelinek  <jakub@redhat.com>
 
        * linux/ia64/syscallent.h: Add #if check to make sure that

diff --git a/system.c b/system.c
index f3308d14bd4ff787c21987c97b8b43a074490f77..0fba58668e15eaec133ec3ca2aeb75f110020760 100644 (file)
--- a/system.c
+++ b/system.c
@@ -1574,6 +1574,8 @@ struct tcb *tcp;
 #endif
 
 #ifdef LINUX
+/* Linux 2.6.18+ headers removed CTL_PROC enum.  */
+# define CTL_PROC 4
 static const struct xlat sysctl_root[] = {
        { CTL_KERN, "CTL_KERN" },
        { CTL_VM, "CTL_VM" },
@@ -1582,6 +1584,9 @@ static const struct xlat sysctl_root[] = {
        { CTL_FS, "CTL_FS" },
        { CTL_DEBUG, "CTL_DEBUG" },
        { CTL_DEV, "CTL_DEV" },
+       { CTL_BUS, "CTL_BUS" },
+       { CTL_ABI, "CTL_ABI" },
+       { CTL_CPU, "CTL_CPU" },
        { 0, NULL }
 };