Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88b4c146 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: use early_memremap() in setup.c 



The remappings in setup.c are all just ordinary memory, so use
early_memremap() rather than early_ioremap().

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 14941779

arch/x86/kernel/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static void __init relocate_initrd(void) 
		if (clen > MAX_MAP_CHUNK-slop)

			clen = MAX_MAP_CHUNK-slop;

		mapaddr = ramdisk_image & PAGE_MASK;

		p = early_ioremap(mapaddr, clen+slop);

		p = early_memremap(mapaddr, clen+slop);

		memcpy(q, p+slop, clen);

		early_iounmap(p, clen+slop);

		q += clen;
@@ -379,7 +379,7 @@ static void __init parse_setup_data(void) 
		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, PAGE_SIZE);

		data = early_memremap(pa_data, PAGE_SIZE);

		switch (data->type) {

		case SETUP_E820_EXT:

			parse_e820_ext(data, pa_data);
@@ -402,7 +402,7 @@ static void __init e820_reserve_setup_data(void) 
		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, sizeof(*data));

		data = early_memremap(pa_data, sizeof(*data));

		e820_update_range(pa_data, sizeof(*data)+data->len,

			 E820_RAM, E820_RESERVED_KERN);

		found = 1;
@@ -428,7 +428,7 @@ static void __init reserve_early_setup_data(void) 
		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, sizeof(*data));

		data = early_memremap(pa_data, sizeof(*data));

		sprintf(buf, "setup data %x", data->type);

		reserve_early(pa_data, pa_data+sizeof(*data)+data->len, buf);

		pa_data = data->next;