Linus, The CONFIG_MULTIQUAD option has bothered me for a while now. It actually covers the jobs of 3 config options, 2 of which exist. This patch splits the use of CONFIG_MULTIQUAD into the 3 config options that it really means: CONFIG_X86_NUMA: General X86 NUMA code (already exists) CONFIG_X86_NUMAQ: Code specific to just the NUMA-Q platform (already exists) CONFIG_CLUSTERED_APIC: Code that specifically deals with clustered APIC mode (new option) The patch replaces every occurence of CONFIG_MULTIQUAD in the kernel, save 1 (arch/i386/pci/Makefile), which is remedied by the patch I will send momentarily. Please apply. Cheers! -Matt