diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:29:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:29:46 -0500 |
| commit | 4e3d0319451805cffa69bdb1352f1c9817bf28bc (patch) | |
| tree | ec9426300d73f742d7487142ca1a57ef806002bc /arch | |
| parent | 11d64be6a631236b3b3d21711c7d1a83d9f85904 (diff) | |
| parent | f60d63f642d824914677fb40330671117dc39c3b (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: DMI: quirk for FSC ESPRIMO Mobile V5505
ACPI: DMI blacklist updates
pnpacpi: __initdata is not an identifier
ACPI: static acpi_chain_head
ACPI: static acpi_find_dsdt_initrd()
ACPI: static acpi_no_initrd_override_setup()
thinkpad_acpi: static
ACPI suspend: Execute _WAK with the right argument
cpuidle: Add Documentation
ACPI, cpuidle: Clarify C-state description in sysfs
ACPI: fix suspend regression due to idle update
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/acpi/cstate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index 10b67170b133..8ca3557a6d59 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c | |||
| @@ -126,6 +126,8 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu, | |||
| 126 | printk(KERN_DEBUG "Monitor-Mwait will be used to enter C-%d " | 126 | printk(KERN_DEBUG "Monitor-Mwait will be used to enter C-%d " |
| 127 | "state\n", cx->type); | 127 | "state\n", cx->type); |
| 128 | } | 128 | } |
| 129 | snprintf(cx->desc, ACPI_CX_DESC_LEN, "ACPI FFH INTEL MWAIT 0x%x", | ||
| 130 | cx->address); | ||
| 129 | 131 | ||
| 130 | out: | 132 | out: |
| 131 | set_cpus_allowed(current, saved_mask); | 133 | set_cpus_allowed(current, saved_mask); |