On Mon, 2002-08-05 at 16:21, Christoph Hellwig wrote: > -Multiquad support for NUMA systems > +Multi-node support for NUMA systems > > What's the difference between CONFIG_X86_NUMA and CONFIG_MULTIQUAD? > > If CONFIG_X86_NUMA is for numaq boxens please use CONFIG_X86_NUMAQ as > in pat's patch. Well, at the moment CONFIG_MULTIQUAD ~= numaq specific stuff + generic x86 numa stuff, so James and Martin are starting to break out the generic stuff out of MULTIQUAD and put the NUMAQ specific stuff under X86_NUMAQ. We're trying to all move to something close to: bool 'Multi-node NUMA system support' CONFIG_X86_NUMA if [ "$CONFIG_X86_NUMA" = "y" ]; then #Platform Choices bool 'Multiquad (IBM/Sequent) NUMAQ support' CONFIG_X86_NUMAQ if [ "$CONFIG_X86_NUMAQ" = "y" ]; then define_bool CONFIG_MULTIQUAD y define_bool CONFIG_X86_TSC_DISABLE y fi bool 'IBM x440 Summit support' CONFIG_X86_SUMMIT_NUMA if [ "$CONFIG_X86_SUMMIT_NUMA" = "y" ]; then define_bool CONFIG_X86_TSC_DISABLE y fi # Common NUMA Features if [ "$CONFIG_X86_NUMAQ" = "y" -o "$CONFIG_X86_SUMMIT_NUMA" = "y" ]; then bool 'Numa Memory Allocation Support' CONFIG_NUMA if [ "$CONFIG_NUMA" = "y" ]; then define_bool CONFIG_DISCONTIGMEM y define_bool CONFIG_HAVE_ARCH_BOOTMEM_NODE y fi #[XXX - future] #bool 'NUMA API support' CONFIG_WHATEVER #bool 'Enable NUMA Scheduler' CONFIG_WHATEVER fi fi > else > - bool 'Multiquad NUMA system' CONFIG_MULTIQUAD > + bool 'Multi-node NUMA system support' CONFIG_X86_NUMA > + if [ "$CONFIG_X86_NUMA" = "y" ]; then > + bool 'Multiquad (IBM/Sequent) NUMAQ support' CONFIG_MULTIQUAD > + fi > fi > > config.in files have three-space indents. ah, thanks. fixed and attached. > + if(!bad_tsc){ > + use_tsc = 1; > + x86_udelay_tsc = 1; > + #ifndef do_gettimeoffset > + do_gettimeoffset = do_fast_gettimeoffset; > + #endif > + } > > you want to read Documentation/CodingStyle, don't you? Always a good read :) Although outside the #ifndef inside a function (which I'm really just moving, not adding to the code), I'm not sure I see the violation in the above (although enlightenment is welcome, in whatever form it might take :). thanks for the feedback -john