2.6.24.6

 kernel

diff --git a/kernel/relay.c b/kernel/relay.c
index 61134eb..889102a 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -92,6 +92,7 @@ static int relay_mmap_buf(struct rchan_buf *buf, struct vm_area_struct *vma)
       return -EINVAL;
 
    vma->vm_ops = &relay_file_mmap_ops;
+   vma->vm_flags |= VM_DONTEXPAND;
    vma->vm_private_data = buf;
    buf->chan->cb->buf_mapped(buf, filp);
 
@@ -1071,7 +1072,7 @@ static int subbuf_splice_actor(struct file *in,
                 unsigned int flags,
                 int *nonpad_ret)
 {
-   unsigned int pidx, poff, total_len, subbuf_pages, ret;
+   unsigned int pidx, poff, total_len, subbuf_pages, nr_pages, ret;
    struct rchan_buf *rbuf = in->private_data;
    unsigned int subbuf_size = rbuf->chan->subbuf_size;
    uint64_t pos = (uint64_t) *ppos;
@@ -1102,8 +1103,9 @@ static int subbuf_splice_actor(struct file *in,
    subbuf_pages = rbuf->chan->alloc_size >> PAGE_SHIFT;
    pidx = (read_start / PAGE_SIZE) % subbuf_pages;
    poff = read_start & ~PAGE_MASK;
+   nr_pages = min_t(unsigned int, subbuf_pages, PIPE_BUFFERS);
 
-   for (total_len = 0; spd.nr_pages < subbuf_pages; spd.nr_pages++) {
+   for (total_len = 0; spd.nr_pages < nr_pages; spd.nr_pages++) {
       unsigned int this_len, this_end, private;
       unsigned int cur_pos = read_start + total_len;