Commit ace6c6c8 authored Jan 21, 2009 by Ingo Molnar

x86: make x86_32 use tlb_64.c, build fix, clean up X86_L1_CACHE_BYTES



Fix:

  arch/x86/mm/tlb.c:47: error: ‘CONFIG_X86_INTERNODE_CACHE_BYTES’ undeclared here (not in a function)

The CONFIG_X86_INTERNODE_CACHE_BYTES symbol is only defined on 64-bit,
because vsmp support is 64-bit only. Define it on 32-bit too - where it
will always be equal to X86_L1_CACHE_BYTES.

Also move the default of X86_L1_CACHE_BYTES (which is separate from the
more commonly used L1_CACHE_SHIFT kconfig symbol) from 128 bytes to
64 bytes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 19803078

arch/x86/Kconfig.cpu

+2 −4

Original line number	Diff line number	Diff line
		@@ -292,15 +292,13 @@ config X86_CPU
		# Define implied options from the CPU selection here
		config X86_L1_CACHE_BYTES
		int
		default "128" if GENERIC_CPU \|\| MPSC
		default "64" if MK8 \|\| MCORE2
		depends on X86_64
		default "128" if MPSC
		default "64" if GENERIC_CPU \|\| MK8 \|\| MCORE2 \|\| X86_32

		config X86_INTERNODE_CACHE_BYTES
		int
		default "4096" if X86_VSMP
		default X86_L1_CACHE_BYTES if !X86_VSMP
		depends on X86_64

		config X86_CMPXCHG
		def_bool X86_64 \|\| (X86_32 && !M386)