Both include files use #ifdef __ASSEMBLY__ which can be moved outside
of the #ifdef CONFIG_X86_32.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
include/asm-x86/e820.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
Index: linux-2.6/include/asm-x86/e820.h
===================================================================
--- linux-2.6.orig/include/asm-x86/e820.h 2008-05-06 11:48:09.000000000 -0700
+++ linux-2.6/include/asm-x86/e820.h 2008-05-06 11:50:53.000000000 -0700
@@ -42,11 +42,11 @@ struct e820map {
*/
#include <linux/ioport.h>
+#ifndef __ASSEMBLY__
+
#ifdef CONFIG_X86_32
#define HIGH_MEMORY (1024*1024)
-#ifndef __ASSEMBLY__
-
extern void setup_memory_map(void);
extern void finish_e820_parsing(void);
@@ -77,10 +77,7 @@ static inline void e820_mark_nosave_regi
}
#endif
-
-#endif/*!__ASSEMBLY__*/
#else /* X86_32 */
-#ifndef __ASSEMBLY__
extern unsigned long find_e820_area(unsigned long start, unsigned long end,
unsigned long size, unsigned long align);
extern unsigned long find_e820_area_size(unsigned long start,
@@ -118,9 +115,8 @@ extern void reserve_early(unsigned long
extern void free_early(unsigned long start, unsigned long end);
extern void early_res_to_bootmem(unsigned long start, unsigned long end);
+#endif /* X86_32 */
#endif/*!__ASSEMBLY__*/
-
-#endif
#endif /* __KERNEL__ */
#endif /* __ASM_E820_H */
--
--
