diff options
| author | Linus Torvalds | 2012-08-03 23:10:00 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-08-03 23:10:00 +0200 |
| commit | d8579fd834de224d2833ce2e82e0f691cc67e8f7 (patch) | |
| tree | 4427904f275fa4520faa97e76568285695a83936 /include/linux | |
| parent | Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd (diff) | |
| parent | Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'o... (diff) | |
| download | kernel-qcow2-linux-d8579fd834de224d2833ce2e82e0f691cc67e8f7.tar.gz kernel-qcow2-linux-d8579fd834de224d2833ce2e82e0f691cc67e8f7.tar.xz kernel-qcow2-linux-d8579fd834de224d2833ce2e82e0f691cc67e8f7.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull ACPI and power management fixes from Len Brown:
"A 3.3 sleep regression fixed, numa bugfix, plus some minor cleanups"
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
ACPI processor: Fix tick_broadcast_mask online/offline regression
ACPI: Only count valid srat memory structures
ACPI: Untangle a return statement for better readability
ACPI / PCI: Do not try to acquire _OSC control if that is hopeless
ACPI: delete _GTS/_BFS support
ACPI/x86: revert 'x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler'
ACPI: replace strlen("string") with sizeof("string") -1
ACPI / PM: Fix build warning in sleep.c for CONFIG_ACPI_SLEEP unset
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3ad510b25283..4f2a76224509 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -96,7 +96,7 @@ void acpi_table_print_madt_entry (struct acpi_subtable_header *madt); void acpi_numa_slit_init (struct acpi_table_slit *slit); void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa); -void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); +int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); void acpi_numa_arch_fixup(void); #ifdef CONFIG_ACPI_HOTPLUG_CPU |