aboutsummaryrefslogtreecommitdiff
path: root/kernel/fork.c
diff options
context:
space:
mode:
authorMister Oyster <oysterized@gmail.com>2017-07-03 12:14:46 +0200
committerMister Oyster <oysterized@gmail.com>2017-07-04 12:11:29 +0200
commitaf79a782f868c860793e76ed5ec1ae5bb4af4187 (patch)
treee945bb42c4077c26bd12f589f9f0f37d39207b03 /kernel/fork.c
parentaefc1dfa10a78d3bc1c6bb40df9c44d9ce5c0823 (diff)
uksm: remove Mtk aksm & uksm (because its fugly)
Revert "KSM: mediatek: implement Adaptive KSM" Revert "mm: uksm: fix maybe-uninitialized warning" Revert "UKSM: Add Governors for Higher CPU usage (HighCPU) for more merging, and low cpu usage (Battery) for less battery drain" Revert "uksm: use deferrable timer" Revert "mm: limit UKSM sleep time instead of failing" Revert "uksm: Fix warning" Revert "uksm: clean up and remove some (no)inlines" Revert "uksm: modify ema logic and tidy up" Revert "uksm: enhancements and cleanups" Revert "uksm: squashed fixups" Revert "UKSM: cast variable as const" Revert "UKSM: remove U64_MAX definition" Revert "add uksm 0.1.2.3 for v3.10 .ge.46.patch"
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 0669e8921..cdd0e4019 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -435,7 +435,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
goto fail_nomem;
charge = len;
}
- tmp = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
if (!tmp)
goto fail_nomem;
*tmp = *mpnt;
@@ -492,7 +492,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
__vma_link_rb(mm, tmp, rb_link, rb_parent);
rb_link = &tmp->vm_rb.rb_right;
rb_parent = &tmp->vm_rb;
- uksm_vma_add_new(tmp);
+
mm->map_count++;
retval = copy_page_range(mm, oldmm, mpnt);