Merge branch 'akpm-current/current'

[karo-tx-linux.git] / mm / huge_memory.c

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index cb34583d016cfcb073e97ddce31e8b3f5f1dd5dd..4b3420ade697b04659e6032ca602c7ac77149ad7 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -186,7 +186,7 @@ static int start_stop_khugepaged(void)
                if (!khugepaged_thread)
                        khugepaged_thread = kthread_run(khugepaged, NULL,
                                                        "khugepaged");
-               if (unlikely(IS_ERR(khugepaged_thread))) {
+               if (IS_ERR(khugepaged_thread)) {
                        pr_err("khugepaged: kthread_run(khugepaged) failed\n");
                        err = PTR_ERR(khugepaged_thread);
                        khugepaged_thread = NULL;