From acb09c3060858a4b9ea3fef93b44c883fbacd3a5 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Wed, 11 Jul 2007 12:18:34 -0700
Subject: [PATCH] --- yaml --- r: 58780 b: refs/heads/master c:
 9c25d134b3735a4b197e108b4c7d6bbec1a275e8 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/i386/kernel/e820.c   |  2 +-
 trunk/include/asm-i386/e820.h   | 14 ++++++++------
 trunk/include/asm-x86_64/e820.h |  4 +---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 46797cd94c8c..c8acb7711d40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85414b693ac037d709582a167a330db3a5d186d8
+refs/heads/master: 9c25d134b3735a4b197e108b4c7d6bbec1a275e8
diff --git a/trunk/arch/i386/kernel/e820.c b/trunk/arch/i386/kernel/e820.c
index 9645bb51f76a..fc822a46897a 100644
--- a/trunk/arch/i386/kernel/e820.c
+++ b/trunk/arch/i386/kernel/e820.c
@@ -734,7 +734,7 @@ void __init print_memory_map(char *who)
 		case E820_NVS:
 				printk("(ACPI NVS)\n");
 				break;
-		default:	printk("type %lu\n", e820.map[i].type);
+		default:	printk("type %u\n", e820.map[i].type);
 				break;
 		}
 	}
diff --git a/trunk/include/asm-i386/e820.h b/trunk/include/asm-i386/e820.h
index 096a2a8eb1da..c03290ccecb2 100644
--- a/trunk/include/asm-i386/e820.h
+++ b/trunk/include/asm-i386/e820.h
@@ -25,13 +25,15 @@
 
 #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;
diff --git a/trunk/include/asm-x86_64/e820.h b/trunk/include/asm-x86_64/e820.h
index 6216fa3f2802..3486e701bd86 100644
--- a/trunk/include/asm-x86_64/e820.h
+++ b/trunk/include/asm-x86_64/e820.h
@@ -11,8 +11,6 @@
 #ifndef __E820_HEADER
 #define __E820_HEADER
 
-#include <linux/mmzone.h>
-
 #define E820MAP	0x2d0		/* our map */
 #define E820MAX	128		/* number of entries in E820MAP */
 #define E820NR	0x1e8		/* # entries in E820MAP */
@@ -30,7 +28,7 @@ struct e820entry {
 } __attribute__((packed));
 
 struct e820map {
-    int nr_map;
+	u32 nr_map;
 	struct e820entry map[E820MAX];
 };