diff --git a/[refs] b/[refs] index ebab7f0c0308..9e4a4355c2c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4edf8bd06916645b57df23a720b17cae4051c43 +refs/heads/master: 32e107f71e4a993ac438f0049aa4019457911ffb diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index 0e8e59939d09..da80612a35f4 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -181,14 +181,7 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages) return; bprm->vma_pages = pages; - -#ifdef SPLIT_RSS_COUNTING - add_mm_counter(mm, MM_ANONPAGES, diff); -#else - spin_lock(&mm->page_table_lock); add_mm_counter(mm, MM_ANONPAGES, diff); - spin_unlock(&mm->page_table_lock); -#endif } static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,