diff options
| author | Dan Murphy <DMurphy@ti.com> | 2014-11-21 12:16:32 -0600 |
|---|---|---|
| committer | Dan Murphy <DMurphy@ti.com> | 2014-11-21 12:16:32 -0600 |
| commit | 5dcfe16d0585aeed7158820e934a5e43ff017476 (patch) | |
| tree | 1974ff5d6d579a774de59bc0ccf19c5f20e64e7b /ipc | |
| parent | d9bd3f9c687afc5c317d2c61262913c9a7c2bd0d (diff) | |
| parent | 2dc2565902d3c24108c4b7101e91957fd068a242 (diff) | |
Merge tag 'v3.14.25' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.14.y
This is the 3.14.25 stable release
* tag 'v3.14.25' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (123 commits)
Linux 3.14.25
mm/page_alloc: prevent MIGRATE_RESERVE pages from being misplaced
mm: vmscan: use proportional scanning during direct reclaim and full scan at DEF_PRIORITY
fs/superblock: avoid locking counting inodes and dentries before reclaiming them
fs/superblock: unregister sb shrinker before ->kill_sb()
mm: fix direct reclaim writeback regression
x86/mm: In the PTE swapout page reclaim case clear the accessed bit instead of flushing the TLB
mm, compaction: properly signal and act upon lock and need_sched() contention
mm/compaction: avoid rescanning pageblocks in isolate_freepages
mm/compaction: do not count migratepages when unnecessary
mm, compaction: terminate async compaction when rescheduling
mm, compaction: embed migration mode in compact_control
mm, compaction: add per-zone migration pfn cache for async compaction
mm, compaction: return failed migration target pages back to freelist
mm, migration: add destination page freeing callback
mm/compaction: cleanup isolate_freepages()
mm/compaction: clean up unused code lines
mm/readahead.c: inline ra_submit
callers of iov_copy_from_user_atomic() don't need pagecache_disable()
mm: remove read_cache_page_async()
...
Signed-off-by: Dan Murphy <DMurphy@ti.com>
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 17028648cfe..cadddc8388f 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. |