diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:32:44 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 05:17:11 -0500 |
commit | ace6c6c840878342f698f0da6588dd5ded755369 (patch) | |
tree | ed9d68efca2ccabbc379246b2fe65607c34f0259 /arch | |
parent | 198030782cedf25391e67e7c88b04f87a5eb6563 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/Kconfig.cpu | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index cdf4a9623237..8eb50ba9161e 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
@@ -292,15 +292,13 @@ config X86_CPU | |||
292 | # Define implied options from the CPU selection here | 292 | # Define implied options from the CPU selection here |
293 | config X86_L1_CACHE_BYTES | 293 | config X86_L1_CACHE_BYTES |
294 | int | 294 | int |
295 | default "128" if GENERIC_CPU || MPSC | 295 | default "128" if MPSC |
296 | default "64" if MK8 || MCORE2 | 296 | default "64" if GENERIC_CPU || MK8 || MCORE2 || X86_32 |
297 | depends on X86_64 | ||
298 | 297 | ||
299 | config X86_INTERNODE_CACHE_BYTES | 298 | config X86_INTERNODE_CACHE_BYTES |
300 | int | 299 | int |
301 | default "4096" if X86_VSMP | 300 | default "4096" if X86_VSMP |
302 | default X86_L1_CACHE_BYTES if !X86_VSMP | 301 | default X86_L1_CACHE_BYTES if !X86_VSMP |
303 | depends on X86_64 | ||
304 | 302 | ||
305 | config X86_CMPXCHG | 303 | config X86_CMPXCHG |
306 | def_bool X86_64 || (X86_32 && !M386) | 304 | def_bool X86_64 || (X86_32 && !M386) |