diff options
author | H. Peter Anvin <hpa@zytor.com> | 2007-07-11 15:18:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 13:55:54 -0400 |
commit | 9c25d134b3735a4b197e108b4c7d6bbec1a275e8 (patch) | |
tree | 20c1bdca391c864cce126e3615c84d10d62852b6 /include/asm-x86_64/e820.h | |
parent | 85414b693ac037d709582a167a330db3a5d186d8 (diff) |
Make definitions for struct e820entry and struct e820map consistent
Make definitions for struct e820entry and struct e820map
consistent between i386 and x86-64.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-x86_64/e820.h')
-rw-r--r-- | include/asm-x86_64/e820.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-x86_64/e820.h b/include/asm-x86_64/e820.h index 6216fa3f2802..3486e701bd86 100644 --- a/include/asm-x86_64/e820.h +++ b/include/asm-x86_64/e820.h | |||
@@ -11,8 +11,6 @@ | |||
11 | #ifndef __E820_HEADER | 11 | #ifndef __E820_HEADER |
12 | #define __E820_HEADER | 12 | #define __E820_HEADER |
13 | 13 | ||
14 | #include <linux/mmzone.h> | ||
15 | |||
16 | #define E820MAP 0x2d0 /* our map */ | 14 | #define E820MAP 0x2d0 /* our map */ |
17 | #define E820MAX 128 /* number of entries in E820MAP */ | 15 | #define E820MAX 128 /* number of entries in E820MAP */ |
18 | #define E820NR 0x1e8 /* # entries in E820MAP */ | 16 | #define E820NR 0x1e8 /* # entries in E820MAP */ |
@@ -30,7 +28,7 @@ struct e820entry { | |||
30 | } __attribute__((packed)); | 28 | } __attribute__((packed)); |
31 | 29 | ||
32 | struct e820map { | 30 | struct e820map { |
33 | int nr_map; | 31 | u32 nr_map; |
34 | struct e820entry map[E820MAX]; | 32 | struct e820entry map[E820MAX]; |
35 | }; | 33 | }; |
36 | 34 | ||