David, I decided to move the state bits DISABLED, MASKED and INPROGRESS into irq_data status. I need that for some other cleanups as well. I added the masked check to the disabled check in the affinity setters, so that should solve your problem hopefully. Thanks, tglx .