diff options
| author | Andy Green <andy.green@linaro.org> | 2012-09-07 10:49:58 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-09-07 12:55:47 +0800 |
| commit | 1f04c3ccf017d6aa8ac636ed5058352222767192 (patch) | |
| tree | c8a344667e5eb96ec4249ccd44e27ddd089e4a95 /mm/shmem.c | |
| parent | 66cb331f3d3dcf1bf4a89d4456680f6fd4f7022a (diff) | |
| parent | f95b978981a7d154ba40d14c18e8ed5c694e6124 (diff) | |
Merge branch 'stable-linux-3.4.y' into tilt-3.4-up
Conflicts:
arch/arm/kernel/traps.c
arch/arm/vfp/entry.S
drivers/base/power/main.c
drivers/net/tun.c
include/linux/rpmsg.h
net/mac80211/mlme.c
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index e281f0658cb8..2910f0d58c46 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1365,6 +1365,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, struct splice_pipe_desc spd = { .pages = pages, .partial = partial, + .nr_pages_max = PIPE_DEF_BUFFERS, .flags = flags, .ops = &page_cache_pipe_buf_ops, .spd_release = spd_release_page, @@ -1453,7 +1454,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos, if (spd.nr_pages) error = splice_to_pipe(pipe, &spd); - splice_shrink_spd(pipe, &spd); + splice_shrink_spd(&spd); if (error > 0) { *ppos += error; |