x86, intel_txt: clean up the impact on generic code, unbreak non-x86