Index: kernel/arch/ia64/src/ski/ski.c
===================================================================
--- kernel/arch/ia64/src/ski/ski.c	(revision de57e0601410d3336e18d797fc95a74b2dce44c0)
+++ kernel/arch/ia64/src/ski/ski.c	(revision 3dea17f5a2dc97de65bf1ff23eb43f3621665af4)
@@ -242,11 +242,19 @@
 void ski_kbd_grab(void)
 {
+	ipl_t ipl = interrupts_disable();
+	spinlock_lock(&ski_kbd_irq.lock);
 	ski_kbd_irq.notif_cfg.notify = false;
+	spinlock_unlock(&ski_kbd_irq.lock);
+	interrupts_restore(ipl);
 }
 
 void ski_kbd_release(void)
 {
+	ipl_t ipl = interrupts_disable();
+	spinlock_lock(&ski_kbd_irq.lock);
 	if (ski_kbd_irq.notif_cfg.answerbox)
 		ski_kbd_irq.notif_cfg.notify = true;
+	spinlock_unlock(&ski_kbd_irq.lock);
+	interrupts_restore(ipl);
 }