D11321.id29986.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11321.id29986.diff
View Options

	Index: sys/boot/i386/libi386/libi386.h
	===================================================================
	--- sys/boot/i386/libi386/libi386.h
	+++ sys/boot/i386/libi386/libi386.h
	@@ -71,7 +71,10 @@

	extern void relocater(void);

	-extern uint32_t relocater_data;
	+/*
	+ * The relocater_data[] is fixed size array allocated in relocater_tramp.S
	+ */
	+extern uint32_t relocater_data[10];
	extern uint32_t relocater_size;

	extern uint16_t relocator_ip;
	Index: sys/boot/i386/loader/chain.c
	===================================================================
	--- sys/boot/i386/loader/chain.c
	+++ sys/boot/i386/loader/chain.c
	@@ -58,7 +58,6 @@
	int fd, len, size = SECTOR_SIZE;
	struct stat st;
	vm_offset_t mem = 0x100000;
	- uint32_t *uintptr = &relocater_data;
	struct i386_devdesc *rootdev;

	if (argc == 1) {
	@@ -108,9 +107,9 @@
	return (CMD_ERROR);
	}

	- uintptr[0] = mem;
	- uintptr[1] = 0x7C00;
	- uintptr[2] = SECTOR_SIZE;
	+ relocater_data[0] = mem;
	+ relocater_data[1] = 0x7C00;
	+ relocater_data[2] = SECTOR_SIZE;

	relocator_edx = bd_unit2bios(rootdev->d_unit);
	relocator_esi = relocater_size;