mm: Drop unlikely before IS_ERR(_OR_NULL)
authorViresh Kumar <viresh.kumar@linaro.org>
Wed, 12 Aug 2015 10:29:46 +0000 (15:59 +0530)
committerJiri Kosina <jkosina@suse.cz>
Tue, 29 Sep 2015 13:15:05 +0000 (15:15 +0200)
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
is no need to do that again from its callers. Drop it.

Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
mm/huge_memory.c

index c107094f79bae9ee895bd6bf30976d900f16c141..e14652480c597d50ab90d999595750d04c475c6a 100644 (file)
@@ -149,7 +149,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;