diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 19:00:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 19:00:53 -0700 |
| commit | 502f4d4f74219749a9758b9bbc27fb665b2e83ab (patch) | |
| tree | 78076e71ea6e455354913005f04b53cff124553f /arch/x86/include/asm/processor.h | |
| parent | da849abeb86ddaa093b0935fde595e8e4dd21ffc (diff) | |
| parent | e5fea868e6c04343e501176a373d568c1c0094aa (diff) | |
| download | op-kernel-dev-502f4d4f74219749a9758b9bbc27fb665b2e83ab.zip op-kernel-dev-502f4d4f74219749a9758b9bbc27fb665b2e83ab.tar.gz | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix and clean up generic_processor_info()
x86: Don't copy per_cpu cpuinfo for BSP two times
x86: Move llc_shared_map out of cpu_info
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 45636ce..4c25ab4 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -94,10 +94,6 @@ struct cpuinfo_x86 { int x86_cache_alignment; /* In bytes */ int x86_power; unsigned long loops_per_jiffy; -#ifdef CONFIG_SMP - /* cpus sharing the last level cache: */ - cpumask_var_t llc_shared_map; -#endif /* cpuid returned max cores value: */ u16 x86_max_cores; u16 apicid; |
