diff --git a/[refs] b/[refs] index c3e2f11dffe1..f4beec490112 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2315ffa0a9f789c588c7139effa7404a387d8685 +refs/heads/master: 2fb10732c3b3c9671b1a391996ce7e551876c25e diff --git a/trunk/kernel/sysctl_binary.c b/trunk/kernel/sysctl_binary.c index 471438bbece6..bf0a4b06782a 100644 --- a/trunk/kernel/sysctl_binary.c +++ b/trunk/kernel/sysctl_binary.c @@ -1393,15 +1393,9 @@ static ssize_t binary_sysctl(const int *name, int nlen, static void deprecated_sysctl_warning(const int *name, int nlen) { - static int msg_count; int i; - /* Ignore accesses to kernel.version */ - if ((nlen == 2) && (name[0] == CTL_KERN) && (name[1] == KERN_VERSION)) - return; - - if (msg_count < 5) { - msg_count++; + if (printk_ratelimit()) { printk(KERN_INFO "warning: process `%s' used the deprecated sysctl " "system call with ", current->comm);