diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /mm/memory.c | |
parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 51a5c23704a..9da8cab1b1b 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -3715,7 +3715,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, | |||
3715 | } | 3715 | } |
3716 | 3716 | ||
3717 | /** | 3717 | /** |
3718 | * @access_remote_vm - access another process' address space | 3718 | * access_remote_vm - access another process' address space |
3719 | * @mm: the mm_struct of the target address space | 3719 | * @mm: the mm_struct of the target address space |
3720 | * @addr: start address to access | 3720 | * @addr: start address to access |
3721 | * @buf: source or destination buffer | 3721 | * @buf: source or destination buffer |