diff options
| author | ian <ian@FreeBSD.org> | 2015-02-12 03:50:33 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-02-12 03:50:33 +0000 |
| commit | dff1ee7f45c73c94ead5792fd2f879e70e6232c8 (patch) | |
| tree | 7c6cdeb383764776a348de294da4e685c265f42c /sys/arm/xscale/i80321/i80321_timer.c | |
| parent | 0a5ffc45680c62f19448a2d2f49d063715444a28 (diff) | |
| download | FreeBSD-src-dff1ee7f45c73c94ead5792fd2f879e70e6232c8.zip FreeBSD-src-dff1ee7f45c73c94ead5792fd2f879e70e6232c8.tar.gz | |
MFC r271394, r271398:
Add more register values to armreg.h and remove CPU_CONTROL_32BP_ENABLE
from asm.h as they were already defined in armreg.h.
Unify interrupts bit definition and usage. While here remove PSR_C_bit.
Diffstat (limited to 'sys/arm/xscale/i80321/i80321_timer.c')
| -rw-r--r-- | sys/arm/xscale/i80321/i80321_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arm/xscale/i80321/i80321_timer.c b/sys/arm/xscale/i80321/i80321_timer.c index 98c1805..3b4e5a1 100644 --- a/sys/arm/xscale/i80321/i80321_timer.c +++ b/sys/arm/xscale/i80321/i80321_timer.c @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <sys/timetc.h> +#include <machine/armreg.h> #include <machine/bus.h> #include <machine/cpu.h> #include <machine/cpufunc.h> @@ -381,7 +382,7 @@ cpu_initclocks(void) /* Report the clock frequency. */ - oldirqstate = disable_interrupts(I32_bit); + oldirqstate = disable_interrupts(PSR_I); irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, #ifdef CPU_XSCALE_81342 |
