Merge pull request torvalds#317 from libos-nuse/feature-hrtimer

lkl: enable HIGH_RES_TIMERS (hrtimer) for the arch
laijs · Feb 9, 2017 · 615a744 · 615a744
2 parents 9294fb3 + 85b1276
commit 615a744
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/arch/lkl/Kconfig b/arch/lkl/Kconfig
@@ -24,6 +24,7 @@ config LKL
        select IP_PNP
        select IP_PNP_DHCP
        select TCP_CONG_BBR
+       select HIGH_RES_TIMERS
 
 config OUTPUTFORMAT
        string

diff --git a/arch/lkl/kernel/irq.c b/arch/lkl/kernel/irq.c
@@ -52,15 +52,19 @@ static struct irq_info {
 
 static bool irqs_enabled;
 
+static struct pt_regs dummy;
+
 static void run_irq(int irq)
 {
 	unsigned long flags;
+	struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)&dummy);
 
 	/* interrupt handlers need to run with interrupts disabled */
 	local_irq_save(flags);
 	irq_enter();
 	generic_handle_irq(irq);
 	irq_exit();
+	set_irq_regs(old_regs);
 	local_irq_restore(flags);
 }