diff options
| author |   H. Peter Anvin <hpa@zytor.com> | 2007-07-11 12:18:34 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 10:55:54 -0700 |
| commit | 9c25d134b3735a4b197e108b4c7d6bbec1a275e8 (patch) | |
| tree | 20c1bdca391c864cce126e3615c84d10d62852b6 /include/asm-x86_64/e820.h | |
| parent | Define zero-page offset 0x1e4 as a scratch field, and use it (diff) | |
| download | linux-dev-9c25d134b3735a4b197e108b4c7d6bbec1a275e8.tar.xz linux-dev-9c25d134b3735a4b197e108b4c7d6bbec1a275e8.zip | |
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 @@ #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]; }; |