diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-07-30 05:15:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-07-30 05:15:13 -0400 |
| commit | f5db340f19f14a8df9dfd22d71fba1513e9f1f7e (patch) | |
| tree | 131d3345bc987aee3c922624de816492e7f323a4 /kernel/sysctl_binary.c | |
| parent | ee438ec8f33c5af0d4a4ffb935c5b9272e8c2680 (diff) | |
| parent | 38115f2f8cec8087d558c062e779c443a01f87d6 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up latest fixes and refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 939a158eab11..02e1859f2ca8 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c | |||
| @@ -1346,7 +1346,7 @@ static void deprecated_sysctl_warning(const int *name, int nlen) | |||
| 1346 | * CTL_KERN/KERN_VERSION is used by older glibc and cannot | 1346 | * CTL_KERN/KERN_VERSION is used by older glibc and cannot |
| 1347 | * ever go away. | 1347 | * ever go away. |
| 1348 | */ | 1348 | */ |
| 1349 | if (name[0] == CTL_KERN && name[1] == KERN_VERSION) | 1349 | if (nlen >= 2 && name[0] == CTL_KERN && name[1] == KERN_VERSION) |
| 1350 | return; | 1350 | return; |
| 1351 | 1351 | ||
| 1352 | if (printk_ratelimit()) { | 1352 | if (printk_ratelimit()) { |