[PATCH] x86: some fixups for the X86_NUMAQ dependencies