diff options
author | Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> | 2012-10-08 19:29:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 03:22:25 -0400 |
commit | 637e3a27ec2c84f7ecd083fa6943da2f19eb5e9f (patch) | |
tree | 9a90ab8b0ec8c21360f1a0e82a7d6a368099f423 /mm | |
parent | 65b3c07b43f7f8a5cbf8923011bd4e6650e3d1dc (diff) |
thp: remove unnecessary check in start_khugepaged
The check is unnecessary since if mm_slot_cache or mm_slots_hash
initialize failed, no sysfs interface will be created
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/huge_memory.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 860ea9127851..9833d8ecf38f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c | |||
@@ -140,10 +140,7 @@ static int start_khugepaged(void) | |||
140 | int err = 0; | 140 | int err = 0; |
141 | if (khugepaged_enabled()) { | 141 | if (khugepaged_enabled()) { |
142 | int wakeup; | 142 | int wakeup; |
143 | if (unlikely(!mm_slot_cache || !mm_slots_hash)) { | 143 | |
144 | err = -ENOMEM; | ||
145 | goto out; | ||
146 | } | ||
147 | mutex_lock(&khugepaged_mutex); | 144 | mutex_lock(&khugepaged_mutex); |
148 | if (!khugepaged_thread) | 145 | if (!khugepaged_thread) |
149 | khugepaged_thread = kthread_run(khugepaged, NULL, | 146 | khugepaged_thread = kthread_run(khugepaged, NULL, |
@@ -163,7 +160,7 @@ static int start_khugepaged(void) | |||
163 | } else | 160 | } else |
164 | /* wakeup to exit */ | 161 | /* wakeup to exit */ |
165 | wake_up_interruptible(&khugepaged_wait); | 162 | wake_up_interruptible(&khugepaged_wait); |
166 | out: | 163 | |
167 | return err; | 164 | return err; |
168 | } | 165 | } |
169 | 166 | ||