From 2f529f9b558ca1c1bd74be7437a84e4711743404 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 01 Nov 2024 02:11:33 +0000
Subject: [PATCH] add xenomai
---
kernel/arch/x86/kernel/hpet.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernel/arch/x86/kernel/hpet.c b/kernel/arch/x86/kernel/hpet.c
index 574df24..f44da6c 100644
--- a/kernel/arch/x86/kernel/hpet.c
+++ b/kernel/arch/x86/kernel/hpet.c
@@ -406,7 +406,7 @@
evt->set_next_event = hpet_clkevt_set_next_event;
evt->set_state_shutdown = hpet_clkevt_set_state_shutdown;
- evt->features = CLOCK_EVT_FEAT_ONESHOT;
+ evt->features = CLOCK_EVT_FEAT_ONESHOT|CLOCK_EVT_FEAT_PIPELINE;
if (hc->boot_cfg & HPET_TN_PERIODIC) {
evt->features |= CLOCK_EVT_FEAT_PERIODIC;
evt->set_state_periodic = hpet_clkevt_set_state_periodic;
@@ -519,7 +519,7 @@
return IRQ_HANDLED;
}
- evt->event_handler(evt);
+ clockevents_handle_event(evt);
return IRQ_HANDLED;
}
@@ -702,7 +702,7 @@
if (arch_spin_is_locked(&old.lock))
goto contended;
- local_irq_save(flags);
+ flags = hard_local_irq_save();
if (arch_spin_trylock(&hpet.lock)) {
new.value = hpet_readl(HPET_COUNTER);
/*
@@ -710,10 +710,10 @@
*/
WRITE_ONCE(hpet.value, new.value);
arch_spin_unlock(&hpet.lock);
- local_irq_restore(flags);
+ hard_local_irq_restore(flags);
return (u64)new.value;
}
- local_irq_restore(flags);
+ hard_local_irq_restore(flags);
contended:
/*
--
Gitblit v1.6.2