diff options
| author | avg <avg@FreeBSD.org> | 2013-07-28 18:44:17 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2013-07-28 18:44:17 +0000 |
| commit | 4e6c4b2a3693b3ff3713bff0906a243d1acbc284 (patch) | |
| tree | 4420aa26daa238558c6bb6511af95c82d7427921 /sys/arm/include | |
| parent | c8737cbf1c0d4bef13135c8c3b4c38fa73c2ccfd (diff) | |
| download | FreeBSD-src-4e6c4b2a3693b3ff3713bff0906a243d1acbc284.zip FreeBSD-src-4e6c4b2a3693b3ff3713bff0906a243d1acbc284.tar.gz | |
Revert r253748,253749
This WIP should not have been committed yet.
Pointyhat to: avg
Diffstat (limited to 'sys/arm/include')
| -rw-r--r-- | sys/arm/include/cpu.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h index 4091002..9dae977 100644 --- a/sys/arm/include/cpu.h +++ b/sys/arm/include/cpu.h @@ -6,11 +6,10 @@ #include <machine/armreg.h> -#ifdef _KERNEL - void cpu_halt(void); void swi_vm(void *); +#ifdef _KERNEL static __inline uint64_t get_cyclecount(void) { @@ -20,6 +19,7 @@ get_cyclecount(void) return ((uint64_t)bt.sec << 56 | bt.frac >> 8); } +#endif #define TRAPF_USERMODE(frame) ((frame->tf_spsr & PSR_MODE) == PSR_USR32_MODE) @@ -50,5 +50,4 @@ void *initarm(struct arm_boot_params *); extern char btext[]; extern char etext[]; int badaddr_read(void *, size_t, void *); -#endif #endif /* !MACHINE_CPU_H */ |
