[SPARC64]: Convert parport to of_platform_driver.

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

diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h
index c5b8fc6109d6cc0bc4214a347cc2c7583cbe0029..c03290ccecb274889663681107cce207501d2cb6 100644 (file)
--- a/include/asm-i386/e820.h
+++ b/include/asm-i386/e820.h
@@ -25,19 +25,22 @@
 
 #ifndef __ASSEMBLY__
 
+struct e820entry {
+       u64 addr;       /* start of memory segment */
+       u64 size;       /* size of memory segment */
+       u32 type;       /* type of memory segment */
+} __attribute__((packed));
+
 struct e820map {
-    int nr_map;
-    struct e820entry {
-       unsigned long long addr;        /* start of memory segment */
-       unsigned long long size;        /* size of memory segment */
-       unsigned long type;             /* type of memory segment */
-    } map[E820MAX];
+       u32 nr_map;
+       struct e820entry map[E820MAX];
 };
 
 extern struct e820map e820;
 
 extern int e820_all_mapped(unsigned long start, unsigned long end,
                           unsigned type);
+extern int e820_any_mapped(u64 start, u64 end, unsigned type);
 extern void find_max_pfn(void);
 extern void register_bootmem_low_pages(unsigned long max_low_pfn);
 extern void e820_register_memory(void);