From 1b79b9498b500c18805eedf7cc5e44a7fee058f9 Mon Sep 17 00:00:00 2001 From: Kirk McKusick Date: Sun, 19 Jul 2015 22:25:16 +0000 Subject: [PATCH] Restructure code for readability improvement. No functional change. Reviewed by: kib --- sys/kern/kern_intr.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 1aebbc17be9d..111dcad5e606 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -1231,17 +1231,14 @@ intr_event_execute_handlers(struct proc *p, struct intr_event *ie) * For software interrupt threads, we only execute * handlers that have their need flag set. Hardware * interrupt threads always invoke all of their handlers. + * + * ih_need can only be 0 or 1. Failed cmpset below + * means that there is no request to execute handlers, + * so a retry of the cmpset is not needed. */ - if ((ie->ie_flags & IE_SOFT) != 0) { - /* - * ih_need can only be 0 or 1. Failed cmpset - * below means that there is no request to - * execute handlers, so a retry of the cmpset - * is not needed. - */ - if (atomic_cmpset_int(&ih->ih_need, 1, 0) == 0) - continue; - } + if ((ie->ie_flags & IE_SOFT) != 0 && + atomic_cmpset_int(&ih->ih_need, 1, 0) == 0) + continue; /* Execute this handler. */ CTR6(KTR_INTR, "%s: pid %d exec %p(%p) for %s flg=%x",