summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2015-08-12 15:59:46 +0530
committerJiri Kosina <jkosina@suse.cz>2015-09-29 15:15:05 +0200
commit18e8e5c7a9f9aef1b45e0729dc340989d5a954d0 (patch)
tree1b66f9986531989521ce2e0465161a0d76b8d94d /mm
parenta1c83681d52704c766d576bea2d7f2f99e8dde23 (diff)
downloadlinux-stable-18e8e5c7a9f9aef1b45e0729dc340989d5a954d0.tar.gz
linux-stable-18e8e5c7a9f9aef1b45e0729dc340989d5a954d0.tar.bz2
linux-stable-18e8e5c7a9f9aef1b45e0729dc340989d5a954d0.zip
mm: Drop unlikely before IS_ERR(_OR_NULL)
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/huge_memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index c107094f79ba..e14652480c59 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -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;