diff --git a/[refs] b/[refs] index aa4193c18a5a..0f963e4507e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 288f02bbb6e9609cbaf1eb7a9cb97ae45ce090b2 +refs/heads/master: 61cf693159d6a968a7014e24905143f71ed8ddcf diff --git a/trunk/kernel/sysctl_binary.c b/trunk/kernel/sysctl_binary.c index b75dbf40f573..112533d5fc08 100644 --- a/trunk/kernel/sysctl_binary.c +++ b/trunk/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 "