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 | |
| parent | f3a2c3ee458bd614231e548c13acb0cf33a68631 (diff) | |
| parent | 8b59a454c421542a51c391f542c80d165f7547a0 (diff) | |
| download | linux-85f4544fbf02f60993c76f5b92517a87f220472d.tar.gz linux-85f4544fbf02f60993c76f5b92517a87f220472d.tar.bz2 linux-85f4544fbf02f60993c76f5b92517a87f220472d.zip | |
Pull trivial into release branch
Diffstat (limited to 'arch/i386')
| -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); /* The code below handles cstate entry with monitor-mwait pair on Intel*/ -struct cstate_entry_s { +struct cstate_entry { struct { unsigned int eax; unsigned int ecx; } states[ACPI_PROCESSOR_MAX_POWER]; }; -static struct cstate_entry_s *cpu_cstate_entry; /* per CPU ptr */ +static struct cstate_entry *cpu_cstate_entry; /* per CPU ptr */ static short mwait_supported[ACPI_PROCESSOR_MAX_POWER]; @@ -71,7 +71,7 @@ static short mwait_supported[ACPI_PROCESSOR_MAX_POWER]; int acpi_processor_ffh_cstate_probe(unsigned int cpu, struct acpi_processor_cx *cx, struct acpi_power_register *reg) { - struct cstate_entry_s *percpu_entry; + struct cstate_entry *percpu_entry; struct cpuinfo_x86 *c = cpu_data + cpu; cpumask_t saved_mask; @@ -136,7 +136,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe); void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx) { unsigned int cpu = smp_processor_id(); - struct cstate_entry_s *percpu_entry; + struct cstate_entry *percpu_entry; percpu_entry = per_cpu_ptr(cpu_cstate_entry, cpu); mwait_idle_with_hints(percpu_entry->states[cx->index].eax, @@ -150,7 +150,7 @@ static int __init ffh_cstate_init(void) if (c->x86_vendor != X86_VENDOR_INTEL) return -1; - cpu_cstate_entry = alloc_percpu(struct cstate_entry_s); + cpu_cstate_entry = alloc_percpu(struct cstate_entry); return 0; } |