From b6e4bfe94d0677e49965adaf1bc2f117024bc5bc Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.de>
Date: Mon, 1 Oct 2012 00:23:53 +0200
Subject: [PATCH] --- yaml --- r: 344047 b: refs/heads/master c:
 8e30524dcc0d0ac1a18a5cee482b9d9cde3cb332 h: refs/heads/master i:   344045:
 d605c4c1aadfda9acf94328363fbea21daa32d45   344043:
 73476bfeb860a89f0f2b23ea524ab53b5104f960   344039:
 6e305bb50baa78bc17d1a8c04d3dd4c5042c765e   344031:
 9555f3a57283fceec3cfb7feda7d0e013c7e5d90 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/acpi/boot.c | 6 ++++++
 trunk/include/linux/acpi.h        | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4db13aa60d17..7f1158867722 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6459606b04e6385ccd3c2060fc10f78a92c7700
+refs/heads/master: 8e30524dcc0d0ac1a18a5cee482b9d9cde3cb332
diff --git a/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c
index b2297e58c6ed..6b75777c0a8d 100644
--- a/trunk/arch/x86/kernel/acpi/boot.c
+++ b/trunk/arch/x86/kernel/acpi/boot.c
@@ -1700,3 +1700,9 @@ int __acpi_release_global_lock(unsigned int *lock)
 	} while (unlikely (val != old));
 	return old & 0x1;
 }
+
+void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size)
+{
+	e820_add_region(addr, size, E820_ACPI);
+	update_e820();
+}
diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h
index 4f2a76224509..946fd1ea79ff 100644
--- a/trunk/include/linux/acpi.h
+++ b/trunk/include/linux/acpi.h
@@ -426,6 +426,14 @@ void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state,
 
 acpi_status acpi_os_prepare_sleep(u8 sleep_state,
 				  u32 pm1a_control, u32 pm1b_control);
+#if CONFIG_X86
+void arch_reserve_mem_area(acpi_physical_address addr, size_t size);
+#else
+static inline void arch_reserve_mem_area(acpi_physical_address addr,
+					  size_t size)
+{
+}
+#endif /* CONFIG_X86 */
 #else
 #define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0)
 #endif