D45474.id139387.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45474.id139387.diff
View Options

	diff --git a/sys/riscv/riscv/locore.S b/sys/riscv/riscv/locore.S
	--- a/sys/riscv/riscv/locore.S
	+++ b/sys/riscv/riscv/locore.S
	@@ -187,7 +187,11 @@

	/* Page tables END */

	- /* Setup supervisor trap vector */
	+ /*
	+ * Set the supervisor trap vector temporarily. Enabling virtual memory
	+ * may generate a page fault. We simply wish to continue onwards, so
	+ * have the trap deliver us to 'va'.
	+ */
	lla t0, va
	sub t0, t0, s9
	li t1, KERNBASE
	@@ -210,7 +214,7 @@
	lla gp, __global_pointer$
	.option pop

	- /* Setup supervisor trap vector */
	+ /* Set the trap vector to the real handler. */
	la t0, cpu_exception_handler
	csrw stvec, t0

	@@ -318,7 +322,11 @@
	/* Get the kernel's load address */
	jal get_physmem

	- /* Setup supervisor trap vector */
	+ /*
	+ * Set the supervisor trap vector temporarily. Enabling virtual memory
	+ * may generate a page fault. We simply wish to continue onwards, so
	+ * have the trap deliver us to 'mpva'.
	+ */
	lla t0, mpva
	sub t0, t0, s9
	li t1, KERNBASE
	@@ -339,7 +347,7 @@
	lla gp, __global_pointer$
	.option pop

	- /* Setup supervisor trap vector */
	+ /* Set the trap vector to the real handler. */
	la t0, cpu_exception_handler
	csrw stvec, t0