From: Andi Kleen <andi@firstfloor.org>
Date: Wed, 16 Dec 2009 11:28:44 +0000 (+0100)
Subject: [sysctl] Fix breakage on systems with older glibc
X-Git-Tag: Ubuntu-5.2.0-15.16~26679
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=61cf693159d6a968a7014e24905143f71ed8ddcf;p=mirror_ubuntu-eoan-kernel.git

[sysctl] Fix breakage on systems with older glibc

As predicted during code review, the sysctl(2) changes made systems with
old glibc nearly unusable.  About every command gives a:

  warning: process `ls' used the deprecated sysctl system call with 1.4

warning in the log.

I see this on a SUSE 10.0 system with glibc 2.3.5.

Don't warn for this common case.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index b75dbf40f573..112533d5fc08 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1399,6 +1399,13 @@ static void deprecated_sysctl_warning(const int *name, int nlen)
 {
 	int i;
 
+	/*
+	 * CTL_KERN/KERN_VERSION is used by older glibc and cannot
+	 * ever go away.
+	 */
+	if (name[0] == CTL_KERN && name[1] == KERN_VERSION)
+		return;
+
 	if (printk_ratelimit()) {
 		printk(KERN_INFO
 			"warning: process `%s' used the deprecated sysctl "