x86: prepare for tlb merge