aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/irq_64.c
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@163.com>2015-10-01 10:55:29 +0800
committerThomas Gleixner <tglx@linutronix.de>2015-10-01 11:08:56 +0200
commita7e705af524d165fe7bc303aee82225c66734885 (patch)
tree14e1bf91ab5ca88f6805749b55c03a4b8ca68fcc /arch/x86/kernel/irq_64.c
parentMerge branch 'x86/for-kvm' into x86/apic (diff)
downloadlinux-dev-a7e705af524d165fe7bc303aee82225c66734885.tar.xz
linux-dev-a7e705af524d165fe7bc303aee82225c66734885.zip
x86/irq: Drop unlikely before IS_ERR_OR_NULL
IS_ERR_OR_NULL already contain an unlikely compiler flag. Drop it. Signed-off-by: Geliang Tang <geliangtang@163.com> Cc: Brian Gerst <brgerst@gmail.com> Cc: Andy Lutomirski <luto@kernel.org> Link: http://lkml.kernel.org/r/03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/irq_64.c')
-rw-r--r--arch/x86/kernel/irq_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
index c767cf2bc80a..206d0b90a3ab 100644
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
@@ -72,7 +72,7 @@ bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)
{
stack_overflow_check(regs);
- if (unlikely(IS_ERR_OR_NULL(desc)))
+ if (IS_ERR_OR_NULL(desc))
return false;
generic_handle_irq_desc(desc);