aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCong Wang2011-11-25 09:26:35 -0600
committerCong Wang2012-03-20 08:48:28 -0500
commitc58e0377d61e209600def7d4d9ae535ea94bc210 (patch)
tree142d1ca23d06458c8b798174e01281ad67b2ab76 /security/tomoyo
parentb85417860172ff693dc115d7999805fc240cec1c (diff)
downloadkernel-common-c58e0377d61e209600def7d4d9ae535ea94bc210.tar.gz
kernel-common-c58e0377d61e209600def7d4d9ae535ea94bc210.tar.xz
kernel-common-c58e0377d61e209600def7d4d9ae535ea94bc210.zip
tomoyo: remove the second argument of k[un]map_atomic()
Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'security/tomoyo')
-rw-r--r--security/tomoyo/domain.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
index 9027ac1534a..38651454ed0 100644
--- a/security/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -886,12 +886,12 @@ bool tomoyo_dump_page(struct linux_binprm *bprm, unsigned long pos,
886 * But remove_arg_zero() uses kmap_atomic()/kunmap_atomic(). 886 * But remove_arg_zero() uses kmap_atomic()/kunmap_atomic().
887 * So do I. 887 * So do I.
888 */ 888 */
889 char *kaddr = kmap_atomic(page, KM_USER0); 889 char *kaddr = kmap_atomic(page);
890 890
891 dump->page = page; 891 dump->page = page;
892 memcpy(dump->data + offset, kaddr + offset, 892 memcpy(dump->data + offset, kaddr + offset,
893 PAGE_SIZE - offset); 893 PAGE_SIZE - offset);
894 kunmap_atomic(kaddr, KM_USER0); 894 kunmap_atomic(kaddr);
895 } 895 }
896 /* Same with put_arg_page(page) in fs/exec.c */ 896 /* Same with put_arg_page(page) in fs/exec.c */
897#ifdef CONFIG_MMU 897#ifdef CONFIG_MMU