D3134.id7134.diff
No OneTemporary
Actions

Size

619 B

Referenced Files

None

Subscribers

None

D3134.id7134.diff
View Options

	Index: head/sys/arm64/include/cpu.h
	===================================================================
	--- head/sys/arm64/include/cpu.h
	+++ head/sys/arm64/include/cpu.h
	@@ -43,6 +43,7 @@

	#include <machine/atomic.h>
	#include <machine/frame.h>
	+#include <machine/armreg.h>

	#define TRAPF_PC(tfp) ((tfp)->tf_lr)
	#define TRAPF_USERMODE(tfp) (((tfp)->tf_elr & (1ul << 63)) == 0)
	@@ -120,9 +121,11 @@
	static __inline uint64_t
	get_cyclecount(void)
	{
	+ uint64_t ret;

	- /* TODO: This is bogus */
	- return (1);
	+ ret = READ_SPECIALREG(cntvct_el0);
	+
	+ return (ret);
	}

	#define ADDRESS_TRANSLATE_FUNC(stage) \