x86: merge resume-trace.h variants