git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86/ACPI: Preserve ACPI-table override during hibernation
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
acpi
/
boot.c
diff --git
a/arch/x86/kernel/acpi/boot.c
b/arch/x86/kernel/acpi/boot.c
index 0d01e7f5078c25a6b9d1c933691cebe3b6b30240..2eeca97b730b3c1817c3087cbfc4d93bcb20fdfc 100644
(file)
--- a/
arch/x86/kernel/acpi/boot.c
+++ b/
arch/x86/kernel/acpi/boot.c
@@
-1772,7
+1772,7
@@
int __acpi_release_global_lock(unsigned int *lock)
void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size)
{
- e820__range_add(addr, size, E820_TYPE_
ACPI
);
+ e820__range_add(addr, size, E820_TYPE_
NVS
);
e820__update_table_print();
}