x86: merge mttr_32/64.h