diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/Makefile | 3 | ||||
-rw-r--r-- | kernel/relay.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 8885627ea021..db9af707ff5b 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
@@ -9,7 +9,7 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o profile.o \ | |||
9 | rcupdate.o extable.o params.o posix-timers.o \ | 9 | rcupdate.o extable.o params.o posix-timers.o \ |
10 | kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \ | 10 | kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \ |
11 | hrtimer.o rwsem.o latency.o nsproxy.o srcu.o \ | 11 | hrtimer.o rwsem.o latency.o nsproxy.o srcu.o \ |
12 | utsname.o notifier.o | 12 | utsname.o notifier.o ksysfs.o |
13 | 13 | ||
14 | obj-$(CONFIG_SYSCTL) += sysctl_check.o | 14 | obj-$(CONFIG_SYSCTL) += sysctl_check.o |
15 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 15 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |
@@ -49,7 +49,6 @@ obj-$(CONFIG_AUDIT) += audit.o auditfilter.o | |||
49 | obj-$(CONFIG_AUDITSYSCALL) += auditsc.o | 49 | obj-$(CONFIG_AUDITSYSCALL) += auditsc.o |
50 | obj-$(CONFIG_AUDIT_TREE) += audit_tree.o | 50 | obj-$(CONFIG_AUDIT_TREE) += audit_tree.o |
51 | obj-$(CONFIG_KPROBES) += kprobes.o | 51 | obj-$(CONFIG_KPROBES) += kprobes.o |
52 | obj-$(CONFIG_SYSFS) += ksysfs.o | ||
53 | obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o | 52 | obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o |
54 | obj-$(CONFIG_GENERIC_HARDIRQS) += irq/ | 53 | obj-$(CONFIG_GENERIC_HARDIRQS) += irq/ |
55 | obj-$(CONFIG_SECCOMP) += seccomp.o | 54 | obj-$(CONFIG_SECCOMP) += seccomp.o |
diff --git a/kernel/relay.c b/kernel/relay.c index 61134eb7a0c8..7c0373322f18 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) | |||
92 | return -EINVAL; | 92 | return -EINVAL; |
93 | 93 | ||
94 | vma->vm_ops = &relay_file_mmap_ops; | 94 | vma->vm_ops = &relay_file_mmap_ops; |
95 | vma->vm_flags |= VM_DONTEXPAND; | ||
95 | vma->vm_private_data = buf; | 96 | vma->vm_private_data = buf; |
96 | buf->chan->cb->buf_mapped(buf, filp); | 97 | buf->chan->cb->buf_mapped(buf, filp); |
97 | 98 | ||