Commit 9c25d134 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Linus Torvalds
Browse files

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: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 85414b69

arch/i386/kernel/e820.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

	}

include/asm-i386/e820.h

+8 −6
Original line number Diff line number Diff line
@@ -25,13 +25,15 @@ 


#ifndef __ASSEMBLY__



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];

	u64 addr;	/* start of memory segment */

	u64 size;	/* size of memory segment */

	u32 type;	/* type of memory segment */

} __attribute__((packed));



struct e820map {

	u32 nr_map;

	struct e820entry map[E820MAX];

};



extern struct e820map e820;

include/asm-x86_64/e820.h

+1 −3
Original line number Diff line number Diff line
@@ -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];

};