Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make definitions for struct e820entry and struct e820map consistent

Browse source 
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>
This commit is contained in:
H. Peter Anvin 2007-07-11 12:18:34 -07:00 • committed by Linus Torvalds
parent 85414b693a
commit 9c25d134b3
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/i386/kernel/e820.c
View file

@ -734,7 +734,7 @@ void __init print_memory_map(char *who)
case E820_NVS: case E820_NVS:
printk("(ACPI NVS)\n"); printk("(ACPI NVS)\n");
break; break;
default: printk("type %lu\n", e820.map[i].type); default: printk("type %u\n", e820.map[i].type);
break; break;
} }
} }

14
include/asm-i386/e820.h
View file

@ -25,13 +25,15 @@
#ifndef __ASSEMBLY__ #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 { struct e820map {
int nr_map; u32 nr_map;
struct e820entry { struct e820entry map[E820MAX];
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];
}; };
extern struct e820map e820; extern struct e820map e820;

4
include/asm-x86_64/e820.h
View file

@ -11,8 +11,6 @@
#ifndef __E820_HEADER #ifndef __E820_HEADER
#define __E820_HEADER #define __E820_HEADER
#include <linux/mmzone.h>
#define E820MAP 0x2d0 /* our map */ #define E820MAP 0x2d0 /* our map */
#define E820MAX 128 /* number of entries in E820MAP */ #define E820MAX 128 /* number of entries in E820MAP */
#define E820NR 0x1e8 /* # entries in E820MAP */ #define E820NR 0x1e8 /* # entries in E820MAP */
@ -30,7 +28,7 @@ struct e820entry {
} __attribute__((packed)); } __attribute__((packed));
struct e820map { struct e820map {
int nr_map; u32 nr_map;
struct e820entry map[E820MAX]; struct e820entry map[E820MAX];
}; };