Merge branch 'x86/cpu' into x86/urgent

Merge the forgotten cleanup patch for the new file, so the mess does not
propagate further.