Ok, I've folded the minimal s390 fix in, please both double check that this is ok as the minimally invasive fix: http://git.infradead.org/users/hch/dma-mapping.git/commitdiff/7bb9bbcee8845af663a7a60df9e2cc24422b3de5 The s390 fix to clean up sev_active can then go into the series that Thiago is working on.