diff options
| author | mav <mav@FreeBSD.org> | 2010-05-24 11:40:49 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2010-05-24 11:40:49 +0000 |
| commit | 48198e3ddd922d3260be990c8ecc8fc16f27d470 (patch) | |
| tree | ba159db619ea3e7bf5e0ee0418e43865078c742f /sys/i386 | |
| parent | 598285f6f9f5354c0c6d341c1c8cd78e9981c0f5 (diff) | |
| download | FreeBSD-src-48198e3ddd922d3260be990c8ecc8fc16f27d470.zip FreeBSD-src-48198e3ddd922d3260be990c8ecc8fc16f27d470.tar.gz | |
- Implement MI helper functions, dividing one or two timer interrupts with
arbitrary frequencies into hardclock(), statclock() and profclock() calls.
Same code with minor variations duplicated several times over the tree for
different timer drivers and architectures.
- Switch all x86 archs to new functions, simplifying the code and removing
extra logic from timer drivers. Other archs are also welcome.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/mp_machdep.c | 3 | ||||
| -rw-r--r-- | sys/i386/include/apicvar.h | 6 | ||||
| -rw-r--r-- | sys/i386/include/clock.h | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 716c25e..0dfb357 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -1279,9 +1279,6 @@ ipi_bitmap_handler(struct trapframe frame) if (ipi_bitmap & (1 << IPI_STATCLOCK)) statclockintr(&frame); - - if (ipi_bitmap & (1 << IPI_PROFCLOCK)) - profclockintr(&frame); } /* diff --git a/sys/i386/include/apicvar.h b/sys/i386/include/apicvar.h index bcb84a0..adfc1e8 100644 --- a/sys/i386/include/apicvar.h +++ b/sys/i386/include/apicvar.h @@ -124,8 +124,7 @@ #define IPI_PREEMPT 1 #define IPI_HARDCLOCK 2 #define IPI_STATCLOCK 3 -#define IPI_PROFCLOCK 4 -#define IPI_BITMAP_LAST IPI_PROFCLOCK +#define IPI_BITMAP_LAST IPI_STATCLOCK #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST) #define IPI_STOP (APIC_IPI_INTS + 7) /* Stop CPU until restarted. */ @@ -152,8 +151,7 @@ #define IPI_PREEMPT 1 #define IPI_HARDCLOCK 2 #define IPI_STATCLOCK 3 -#define IPI_PROFCLOCK 4 -#define IPI_BITMAP_LAST IPI_PROFCLOCK +#define IPI_BITMAP_LAST IPI_STATCLOCK #define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST) #define IPI_STOP (APIC_IPI_INTS + 7) /* Stop CPU until restarted. */ diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index c0c55ed..7a4a081 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -27,7 +27,6 @@ struct trapframe; int hardclockintr(struct trapframe *frame); int statclockintr(struct trapframe *frame); -int profclockintr(struct trapframe *frame); /* * Driver to clock driver interface. |
