When I originally wrote the patches implementing the in-kernel topology 
macros, they were meant to be called as a second layer of functions, 
sans underbars.  This additional layer was deemed unnecessary and 
summarily dropped.  As such, carrying around (and typing!) all these 
extra underbars is quite pointless.  Here's a patch to nip this in the 
(sorta) bud.  The macros only appear in 16 files so far, most of them 
being the definitions themselves.

[mcd@arrakis push]$ diffstat remove_underbars-2.5.59.patch
  drivers/base/cpu.c             |    2 +-
  drivers/base/memblk.c          |    2 +-
  drivers/base/node.c            |    2 +-
  include/asm-alpha/topology.h   |   10 +++++-----
  include/asm-generic/topology.h |   24 ++++++++++++------------
  include/asm-i386/cpu.h         |    2 +-
  include/asm-i386/memblk.h      |    2 +-
  include/asm-i386/node.h        |    2 +-
  include/asm-i386/topology.h    |   14 +++++++-------
  include/asm-ia64/topology.h    |   18 +++++++++---------
  include/asm-mips64/topology.h  |    2 +-
  include/asm-ppc64/topology.h   |   13 ++++---------
  include/linux/mmzone.h         |    2 +-
  kernel/sched.c                 |   10 +++++-----
  mm/page_alloc.c                |    2 +-
  mm/vmscan.c                    |    2 +-
  16 files changed, 52 insertions(+), 57 deletions(-)

Any objections?

Cheers!

-Matt