D39852.1778709252.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39852.1778709252.diff
View Options

	diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
	--- a/sys/kern/link_elf.c
	+++ b/sys/kern/link_elf.c
	@@ -725,6 +725,7 @@

	ef->vnet_start = 0;
	ef->vnet_stop = 0;
	+ ef->vnet_base = 0;
	error = link_elf_lookup_set(&ef->lf, "vnet", (void ***)&ef->vnet_start,
	(void ***)&ef->vnet_stop, NULL);
	/* Error just means there is no vnet data set to relocate. */
	@@ -767,7 +768,6 @@
	return (ENOSPC);
	}
	memcpy((void )ef->vnet_base, (void )ef->vnet_start, size);
	- vnet_data_copy((void *)ef->vnet_base, size);
	elf_set_add(&set_vnet_list, ef->vnet_start, ef->vnet_stop,
	ef->vnet_base);

	diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
	--- a/sys/kern/link_elf_obj.c
	+++ b/sys/kern/link_elf_obj.c
	@@ -548,7 +548,6 @@
	}
	memcpy(vnet_data, ef->progtab[pb].addr,
	ef->progtab[pb].size);
	- vnet_data_copy(vnet_data, shdr[i].sh_size);
	ef->progtab[pb].addr = vnet_data;
	#endif
	} else if ((ef->progtab[pb].name != NULL &&
	@@ -1115,18 +1114,11 @@
	error = EINVAL;
	goto out;
	}
	- /* Initialize the per-cpu or vnet area. */
	+ /* Initialize the per-cpu area. */
	if (ef->progtab[pb].addr != (void *)mapbase &&
	!strcmp(ef->progtab[pb].name, DPCPU_SETNAME))
	dpcpu_copy(ef->progtab[pb].addr,
	shdr[i].sh_size);
	-#ifdef VIMAGE
	- else if (ef->progtab[pb].addr !=
	- (void *)mapbase &&
	- !strcmp(ef->progtab[pb].name, VNET_SETNAME))
	- vnet_data_copy(ef->progtab[pb].addr,
	- shdr[i].sh_size);
	-#endif
	} else
	bzero(ef->progtab[pb].addr, shdr[i].sh_size);