Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332363
b: refs/heads/master
c: 637e3a2
h: refs/heads/master
i:
  332361: a802f23
  332359: 3fcec94
v: v3
  • Loading branch information
Xiao Guangrong authored and Linus Torvalds committed Oct 9, 2012
1 parent 51a7486 commit ff53c98
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 65b3c07b43f7f8a5cbf8923011bd4e6650e3d1dc
refs/heads/master: 637e3a27ec2c84f7ecd083fa6943da2f19eb5e9f
7 changes: 2 additions & 5 deletions trunk/mm/huge_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,7 @@ static int start_khugepaged(void)
int err = 0;
if (khugepaged_enabled()) {
int wakeup;
if (unlikely(!mm_slot_cache || !mm_slots_hash)) {
err = -ENOMEM;
goto out;
}

mutex_lock(&khugepaged_mutex);
if (!khugepaged_thread)
khugepaged_thread = kthread_run(khugepaged, NULL,
Expand All @@ -163,7 +160,7 @@ static int start_khugepaged(void)
} else
/* wakeup to exit */
wake_up_interruptible(&khugepaged_wait);
out:

return err;
}

Expand Down

0 comments on commit ff53c98

Please sign in to comment.