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/mips/include/cpu.h | |
| 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/mips/include/cpu.h')
| -rw-r--r-- | sys/mips/include/cpu.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/mips/include/cpu.h b/sys/mips/include/cpu.h index ff5117a..2691cf2 100644 --- a/sys/mips/include/cpu.h +++ b/sys/mips/include/cpu.h @@ -49,8 +49,6 @@ #include <machine/endian.h> -#if defined(_KERNEL) - /* BEGIN: these are going away */ #define soft_int_mask(softintr) (1 << ((softintr) + 8)) @@ -76,7 +74,9 @@ * A machine-independent interface to the CPU's counter. */ #define get_cyclecount() mips_rd_count() +#endif /* !_LOCORE */ +#if defined(_KERNEL) && !defined(_LOCORE) extern char btext[]; extern char etext[]; @@ -85,6 +85,5 @@ void swi_vm(void *); void cpu_halt(void); void cpu_reset(void); -#endif /* !_LOCORE */ #endif /* _KERNEL */ #endif /* !_MACHINE_CPU_H_ */ |
