diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:30:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:30:05 +0200 |
| commit | 1ba89386db0a3f39590b90b5dd20d7149ae52de0 (patch) | |
| tree | 7211f558d841cb40e1015d0b7527643ad55cb8e7 /arch/x86/kernel/cpu/cpu.h | |
| parent | a26929fb489188ff959b1715ee67f0c9f84405b5 (diff) | |
| parent | ae94b8075a2ed58d2318ef03827b25bc844f844e (diff) | |
| download | kernel_samsung_aries-1ba89386db0a3f39590b90b5dd20d7149ae52de0.zip kernel_samsung_aries-1ba89386db0a3f39590b90b5dd20d7149ae52de0.tar.gz kernel_samsung_aries-1ba89386db0a3f39590b90b5dd20d7149ae52de0.tar.bz2 | |
Merge branch 'x86/core' into x86/x2apic
Diffstat (limited to 'arch/x86/kernel/cpu/cpu.h')
| -rw-r--r-- | arch/x86/kernel/cpu/cpu.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index 783691b..4d894e8 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h @@ -1,3 +1,6 @@ +#ifndef ARCH_X86_CPU_H + +#define ARCH_X86_CPU_H struct cpu_model_info { int vendor; @@ -36,3 +39,5 @@ extern struct cpu_vendor_dev __x86cpuvendor_start[], __x86cpuvendor_end[]; extern int get_model_name(struct cpuinfo_x86 *c); extern void display_cacheinfo(struct cpuinfo_x86 *c); + +#endif |