[PATCH] x86_64: Fix apicid versus cpu# confusion.