Linus,
	This patch cleans up topology macros for i386.  And it's all wrapped in 
CONFIG_X86_NUMAQ, so it'll play nice.

i386_topology_fixup.patch

Creates and fills arrays with node<->cpu mapping information so that the 
topology lookup functions become simple array access, rather than 
recalculating each time.

[mcd@arrakis to_submit]$ diffstat i386_topology_fixup-2.5.45.patch
  arch/i386/kernel/smpboot.c  |   43 
+++++++++++++++++++++++++++++++++++++++++++
  include/asm-i386/smpboot.h  |    8 ++++++++
  include/asm-i386/topology.h |   43 
+++++--------------------------------------
  3 files changed, 56 insertions(+), 38 deletions(-)

Please apply...

Cheers!

-Matt