x86: fix possible x86_64 and EFI regression