x86/setup: Fix static memory detection

[linux-2.6-microblaze.git] / arch / x86 / include / asm / sections.h

diff --git a/arch/x86/include/asm/sections.h b/arch/x86/include/asm/sections.h
index 036c360..a6e8373 100644 (file)
--- a/arch/x86/include/asm/sections.h
+++ b/arch/x86/include/asm/sections.h
@@ -2,6 +2,8 @@
 #ifndef _ASM_X86_SECTIONS_H
 #define _ASM_X86_SECTIONS_H
 
+#define arch_is_kernel_initmem_freed arch_is_kernel_initmem_freed
+
 #include <asm-generic/sections.h>
 #include <asm/extable.h>
 
@@ -14,4 +16,22 @@ extern char __end_rodata_hpage_align[];
 
 extern char __end_of_kernel_reserve[];
 
+extern unsigned long _brk_start, _brk_end;
+
+static inline bool arch_is_kernel_initmem_freed(unsigned long addr)
+{
+       /*
+        * If _brk_start has not been cleared, brk allocation is incomplete,
+        * and we can not make assumptions about its use.
+        */
+       if (_brk_start)
+               return 0;
+
+       /*
+        * After brk allocation is complete, space between _brk_end and _end
+        * is available for allocation.
+        */
+       return addr >= _brk_end && addr < (unsigned long)&_end;
+}
+
 #endif /* _ASM_X86_SECTIONS_H */