Pull new-efi-memmap into release branch
This commit is contained in:
@@ -78,6 +78,19 @@ struct screen_info screen_info;
|
||||
unsigned long vga_console_iobase;
|
||||
unsigned long vga_console_membase;
|
||||
|
||||
static struct resource data_resource = {
|
||||
.name = "Kernel data",
|
||||
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
||||
};
|
||||
|
||||
static struct resource code_resource = {
|
||||
.name = "Kernel code",
|
||||
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
||||
};
|
||||
extern void efi_initialize_iomem_resources(struct resource *,
|
||||
struct resource *);
|
||||
extern char _text[], _end[], _etext[];
|
||||
|
||||
unsigned long ia64_max_cacheline_size;
|
||||
unsigned long ia64_iobase; /* virtual address for I/O accesses */
|
||||
EXPORT_SYMBOL(ia64_iobase);
|
||||
@@ -171,6 +184,22 @@ sort_regions (struct rsvd_region *rsvd_region, int max)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Request address space for all standard resources
|
||||
*/
|
||||
static int __init register_memory(void)
|
||||
{
|
||||
code_resource.start = ia64_tpa(_text);
|
||||
code_resource.end = ia64_tpa(_etext) - 1;
|
||||
data_resource.start = ia64_tpa(_etext);
|
||||
data_resource.end = ia64_tpa(_end) - 1;
|
||||
efi_initialize_iomem_resources(&code_resource, &data_resource);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
__initcall(register_memory);
|
||||
|
||||
/**
|
||||
* reserve_memory - setup reserved memory areas
|
||||
*
|
||||
@@ -211,6 +240,9 @@ reserve_memory (void)
|
||||
}
|
||||
#endif
|
||||
|
||||
efi_memmap_init(&rsvd_region[n].start, &rsvd_region[n].end);
|
||||
n++;
|
||||
|
||||
/* end of memory marker */
|
||||
rsvd_region[n].start = ~0UL;
|
||||
rsvd_region[n].end = ~0UL;
|
||||
|
Reference in New Issue
Block a user