diff options
| author | Balaji Rao <balajirrao@gmail.com> | 2008-01-30 13:30:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:03 +0100 |
| commit | e3f37a54f690d3e64995ea7ecea08c5ab3070faf (patch) | |
| tree | 1d9d62d95b747ef47cdf994357bd9a41d02889a3 /include/linux/hpet.h | |
| parent | 45fe4fe19120a22f7339f5bb110447170c25fca9 (diff) | |
| download | blackbird-op-linux-e3f37a54f690d3e64995ea7ecea08c5ab3070faf.tar.gz blackbird-op-linux-e3f37a54f690d3e64995ea7ecea08c5ab3070faf.zip | |
x86: assign IRQs to HPET timers
The userspace API for the HPET (see Documentation/hpet.txt) did not work. The
HPET_IE_ON ioctl was failing as there was no IRQ assigned to the timer
device. This patch fixes it by allocating IRQs to timer blocks in the HPET.
arch/x86/kernel/hpet.c | 13 +++++--------
drivers/char/hpet.c | 45 ++++++++++++++++++++++++++++++++++++++-------
include/linux/hpet.h | 2 +-
3 files changed, 44 insertions(+), 16 deletions(-)
Signed-off-by: Balaji Rao <balajirrao@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/hpet.h')
| -rw-r--r-- | include/linux/hpet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hpet.h b/include/linux/hpet.h index 707f7cb9e795..e3c0b2aa944c 100644 --- a/include/linux/hpet.h +++ b/include/linux/hpet.h @@ -64,7 +64,7 @@ struct hpet { */ #define Tn_INT_ROUTE_CAP_MASK (0xffffffff00000000ULL) -#define Tn_INI_ROUTE_CAP_SHIFT (32UL) +#define Tn_INT_ROUTE_CAP_SHIFT (32UL) #define Tn_FSB_INT_DELCAP_MASK (0x8000UL) #define Tn_FSB_INT_DELCAP_SHIFT (15) #define Tn_FSB_EN_CNF_MASK (0x4000UL) |
