summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Yeoh <cyeoh@au1.ibm.com>2012-05-29 15:06:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-29 16:22:20 -0700
commit5febcbe99d4766cc383909c447e002e63d8b4592 (patch)
treedd2b87e923c982676ed07260ea7841a41098210a
parenteb6332a54542bcd3aedb121ecb247f172b8f3602 (diff)
downloadlinux-3.10-5febcbe99d4766cc383909c447e002e63d8b4592.tar.gz
linux-3.10-5febcbe99d4766cc383909c447e002e63d8b4592.tar.bz2
linux-3.10-5febcbe99d4766cc383909c447e002e63d8b4592.zip
Cross Memory Attach: make it Kconfigurable
Add a Kconfig option to allow people who don't want cross memory attach to not have it included in their build. Signed-off-by: Chris Yeoh <yeohc@au1.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/Kconfig10
-rw-r--r--mm/Makefile7
2 files changed, 15 insertions, 2 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 39220026c79..b2176374b98 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -349,6 +349,16 @@ choice
benefit.
endchoice
+config CROSS_MEMORY_ATTACH
+ bool "Cross Memory Support"
+ depends on MMU
+ default y
+ help
+ Enabling this option adds the system calls process_vm_readv and
+ process_vm_writev which allow a process with the correct privileges
+ to directly read from or write to to another process's address space.
+ See the man page for more details.
+
#
# UP and nommu archs use km based percpu allocator
#
diff --git a/mm/Makefile b/mm/Makefile
index ccecbf9818f..a156285ce88 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -5,8 +5,11 @@
mmu-y := nommu.o
mmu-$(CONFIG_MMU) := fremap.o highmem.o madvise.o memory.o mincore.o \
mlock.o mmap.o mprotect.o mremap.o msync.o rmap.o \
- vmalloc.o pagewalk.o pgtable-generic.o \
- process_vm_access.o
+ vmalloc.o pagewalk.o pgtable-generic.o
+
+ifdef CONFIG_CROSS_MEMORY_ATTACH
+mmu-$(CONFIG_MMU) += process_vm_access.o
+endif
obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
maccess.o page_alloc.o page-writeback.o \