Pull sbs into release branch

[linux-2.6] / include / asm-i386 / e820.h

diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h
index c03290ccecb274889663681107cce207501d2cb6..43114c824608b21f96c89a814b5499c1d71008d3 100644 (file)
--- a/include/asm-i386/e820.h
+++ b/include/asm-i386/e820.h
@@ -47,6 +47,14 @@ extern void e820_register_memory(void);
 extern void limit_regions(unsigned long long size);
 extern void print_memory_map(char *who);
 
+#if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND)
+extern void e820_mark_nosave_regions(void);
+#else
+static inline void e820_mark_nosave_regions(void)
+{
+}
+#endif
+
 #endif/*!__ASSEMBLY__*/
 
 #endif/*__E820_HEADER*/