[PATCH] uml: oS header cleanups