diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
| commit | 0c8c708a7e6b52556ee9079041f504191ec5f0e9 (patch) | |
| tree | fb8da2f5e70ac1d21d41d5a900e48d42c1c999eb /arch/x86/kernel/cpu/cpu.h | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
| parent | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (diff) | |
Merge branch 'x86/core' into x86/unify-cpu-detect
Diffstat (limited to 'arch/x86/kernel/cpu/cpu.h')
| -rw-r--r-- | arch/x86/kernel/cpu/cpu.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index 4d894e8565fe..3cc9d92afd8f 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h | |||
| @@ -21,21 +21,15 @@ struct cpu_dev { | |||
| 21 | void (*c_init)(struct cpuinfo_x86 * c); | 21 | void (*c_init)(struct cpuinfo_x86 * c); |
| 22 | void (*c_identify)(struct cpuinfo_x86 * c); | 22 | void (*c_identify)(struct cpuinfo_x86 * c); |
| 23 | unsigned int (*c_size_cache)(struct cpuinfo_x86 * c, unsigned int size); | 23 | unsigned int (*c_size_cache)(struct cpuinfo_x86 * c, unsigned int size); |
| 24 | int c_x86_vendor; | ||
| 24 | }; | 25 | }; |
| 25 | 26 | ||
| 26 | extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM]; | 27 | #define cpu_dev_register(cpu_devX) \ |
| 28 | static struct cpu_dev *__cpu_dev_##cpu_devX __used \ | ||
| 29 | __attribute__((__section__(".x86_cpu_dev.init"))) = \ | ||
| 30 | &cpu_devX; | ||
| 27 | 31 | ||
| 28 | struct cpu_vendor_dev { | 32 | extern struct cpu_dev *__x86_cpu_dev_start[], *__x86_cpu_dev_end[]; |
| 29 | int vendor; | ||
| 30 | struct cpu_dev *cpu_dev; | ||
| 31 | }; | ||
| 32 | |||
| 33 | #define cpu_vendor_dev_register(cpu_vendor_id, cpu_dev) \ | ||
| 34 | static struct cpu_vendor_dev __cpu_vendor_dev_##cpu_vendor_id __used \ | ||
| 35 | __attribute__((__section__(".x86cpuvendor.init"))) = \ | ||
| 36 | { cpu_vendor_id, cpu_dev } | ||
| 37 | |||
| 38 | extern struct cpu_vendor_dev __x86cpuvendor_start[], __x86cpuvendor_end[]; | ||
| 39 | 33 | ||
| 40 | extern int get_model_name(struct cpuinfo_x86 *c); | 34 | extern int get_model_name(struct cpuinfo_x86 *c); |
| 41 | extern void display_cacheinfo(struct cpuinfo_x86 *c); | 35 | extern void display_cacheinfo(struct cpuinfo_x86 *c); |