diff options
author | Len Brown <len.brown@intel.com> | 2007-01-11 01:55:25 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-01-11 01:55:25 -0500 |
commit | 85f4544fbf02f60993c76f5b92517a87f220472d (patch) | |
tree | f88eb4526e9cb6684f93b04ab440b42634aa5728 /arch/i386/kernel | |
parent | f3a2c3ee458bd614231e548c13acb0cf33a68631 (diff) | |
parent | 8b59a454c421542a51c391f542c80d165f7547a0 (diff) |
Pull trivial into release branch
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r-- | arch/i386/kernel/acpi/cstate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/i386/kernel/acpi/cstate.c index 12e937c1ce4b..2d39f55d29a8 100644 --- a/arch/i386/kernel/acpi/cstate.c +++ b/arch/i386/kernel/acpi/cstate.c | |||
@@ -47,13 +47,13 @@ EXPORT_SYMBOL(acpi_processor_power_init_bm_check); | |||
47 | 47 | ||
48 | /* The code below handles cstate entry with monitor-mwait pair on Intel*/ | 48 | /* The code below handles cstate entry with monitor-mwait pair on Intel*/ |
49 | 49 | ||
50 | struct cstate_entry_s { | 50 | struct cstate_entry { |
51 | struct { | 51 | struct { |
52 | unsigned int eax; | 52 | unsigned int eax; |
53 | unsigned int ecx; | 53 | unsigned int ecx; |
54 | } states[ACPI_PROCESSOR_MAX_POWER]; | 54 | } states[ACPI_PROCESSOR_MAX_POWER]; |
55 | }; | 55 | }; |
56 | static struct cstate_entry_s *cpu_cstate_entry; /* per CPU ptr */ | 56 | static struct cstate_entry *cpu_cstate_entry; /* per CPU ptr */ |
57 | 57 | ||
58 | static short mwait_supported[ACPI_PROCESSOR_MAX_POWER]; | 58 | static short mwait_supported[ACPI_PROCESSOR_MAX_POWER]; |
59 | 59 | ||
@@ -71,7 +71,7 @@ static short mwait_supported[ACPI_PROCESSOR_MAX_POWER]; | |||
71 | int acpi_processor_ffh_cstate_probe(unsigned int cpu, | 71 | int acpi_processor_ffh_cstate_probe(unsigned int cpu, |
72 | struct acpi_processor_cx *cx, struct acpi_power_register *reg) | 72 | struct acpi_processor_cx *cx, struct acpi_power_register *reg) |
73 | { | 73 | { |
74 | struct cstate_entry_s *percpu_entry; | 74 | struct cstate_entry *percpu_entry; |
75 | struct cpuinfo_x86 *c = cpu_data + cpu; | 75 | struct cpuinfo_x86 *c = cpu_data + cpu; |
76 | 76 | ||
77 | cpumask_t saved_mask; | 77 | cpumask_t saved_mask; |
@@ -136,7 +136,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe); | |||
136 | void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx) | 136 | void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx) |
137 | { | 137 | { |
138 | unsigned int cpu = smp_processor_id(); | 138 | unsigned int cpu = smp_processor_id(); |
139 | struct cstate_entry_s *percpu_entry; | 139 | struct cstate_entry *percpu_entry; |
140 | 140 | ||
141 | percpu_entry = per_cpu_ptr(cpu_cstate_entry, cpu); | 141 | percpu_entry = per_cpu_ptr(cpu_cstate_entry, cpu); |
142 | mwait_idle_with_hints(percpu_entry->states[cx->index].eax, | 142 | mwait_idle_with_hints(percpu_entry->states[cx->index].eax, |
@@ -150,7 +150,7 @@ static int __init ffh_cstate_init(void) | |||
150 | if (c->x86_vendor != X86_VENDOR_INTEL) | 150 | if (c->x86_vendor != X86_VENDOR_INTEL) |
151 | return -1; | 151 | return -1; |
152 | 152 | ||
153 | cpu_cstate_entry = alloc_percpu(struct cstate_entry_s); | 153 | cpu_cstate_entry = alloc_percpu(struct cstate_entry); |
154 | return 0; | 154 | return 0; |
155 | } | 155 | } |
156 | 156 | ||