diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-11-23 19:59:22 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-11-23 19:59:22 -0500 |
| commit | 3183b5124f9c111beae69ccfb25ed77f1b9ca31a (patch) | |
| tree | d055e63c078afab34735a13bbbec3c7d2a7a3edf /ipc | |
| parent | f652d979c206de8fe7e223f5bcd549dc8f663550 (diff) | |
| parent | 2dc2565902d3c24108c4b7101e91957fd068a242 (diff) | |
| download | linux-rt-3183b5124f9c111beae69ccfb25ed77f1b9ca31a.tar.gz | |
Merge tag 'v3.14.25' into v3.14-rt
This is the 3.14.25 stable release
Conflicts:
include/linux/radix-tree.h
kernel/rcu/tree.c
mm/filemap.c
mm/page_alloc.c
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_sysctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c index 17028648cfeb..cadddc8388f3 100644 --- a/ipc/ipc_sysctl.c +++ b/ipc/ipc_sysctl.c @@ -123,7 +123,6 @@ static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { struct ctl_table ipc_table; - size_t lenp_bef = *lenp; int oldval; int rc; @@ -133,7 +132,7 @@ static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write, rc = proc_dointvec_minmax(&ipc_table, write, buffer, lenp, ppos); - if (write && !rc && lenp_bef == *lenp) { + if (write && !rc) { int newval = *((int *)(ipc_table.data)); /* * The file "auto_msgmni" has correctly been set. |