Index: kernel/generic/include/console/console.h
===================================================================
--- kernel/generic/include/console/console.h	(revision af774597a1e2bce677a5ef151d083e3d3dcf72ae)
+++ kernel/generic/include/console/console.h	(revision 571cc2dd327eec67cc03d4e0d937e24c3fdb6a17)
@@ -67,5 +67,5 @@
 extern void kio_flush(void);
 extern void kio_push_char(const char32_t);
-SPINLOCK_EXTERN(kio_lock);
+extern irq_spinlock_t kio_lock;
 
 extern sys_errno_t sys_kio(int cmd, uspace_addr_t buf, size_t size);
Index: kernel/generic/src/console/console.c
===================================================================
--- kernel/generic/src/console/console.c	(revision af774597a1e2bce677a5ef151d083e3d3dcf72ae)
+++ kernel/generic/src/console/console.c	(revision 571cc2dd327eec67cc03d4e0d937e24c3fdb6a17)
@@ -86,5 +86,5 @@
 
 /** Kernel log spinlock */
-SPINLOCK_INITIALIZE_NAME(kio_lock, "kio_lock");
+IRQ_SPINLOCK_INITIALIZE(kio_lock);
 
 /** Physical memory area used for kio buffer */
@@ -254,5 +254,5 @@
 		return;
 
-	spinlock_lock(&kio_lock);
+	irq_spinlock_lock(&kio_lock, true);
 
 	if (kio_notified != kio_written) {
@@ -261,5 +261,5 @@
 	}
 
-	spinlock_unlock(&kio_lock);
+	irq_spinlock_unlock(&kio_lock, true);
 }
 
@@ -274,5 +274,5 @@
 		return;
 
-	spinlock_lock(&kio_lock);
+	irq_spinlock_lock(&kio_lock, true);
 
 	/* Print characters that weren't printed earlier */
@@ -286,10 +286,10 @@
 		 * the character.
 		 */
-		spinlock_unlock(&kio_lock);
+		irq_spinlock_unlock(&kio_lock, true);
 		stdout->op->write(stdout, tmp);
-		spinlock_lock(&kio_lock);
-	}
-
-	spinlock_unlock(&kio_lock);
+		irq_spinlock_lock(&kio_lock, true);
+	}
+
+	irq_spinlock_unlock(&kio_lock, true);
 }
 
@@ -308,7 +308,7 @@
 	bool ordy = ((stdout) && (stdout->op->write));
 
-	spinlock_lock(&kio_lock);
+	irq_spinlock_lock(&kio_lock, true);
 	kio_push_char(ch);
-	spinlock_unlock(&kio_lock);
+	irq_spinlock_unlock(&kio_lock, true);
 
 	/* Output stored characters */
Index: kernel/generic/src/log/log.c
===================================================================
--- kernel/generic/src/log/log.c	(revision af774597a1e2bce677a5ef151d083e3d3dcf72ae)
+++ kernel/generic/src/log/log.c	(revision 571cc2dd327eec67cc03d4e0d937e24c3fdb6a17)
@@ -60,5 +60,5 @@
 
 /** Cyclic buffer holding the data for kernel log */
-uint8_t log_buffer[LOG_LENGTH] __attribute__((aligned(PAGE_SIZE)));
+static uint8_t log_buffer[LOG_LENGTH] __attribute__((aligned(PAGE_SIZE)));
 
 /** Kernel log initialized */
@@ -66,11 +66,11 @@
 
 /** Position in the cyclic buffer where the first log entry starts */
-size_t log_start = 0;
+static size_t log_start = 0;
 
 /** Sum of length of all log entries currently stored in the cyclic buffer */
-size_t log_used = 0;
+static size_t log_used = 0;
 
 /** Log spinlock */
-SPINLOCK_STATIC_INITIALIZE_NAME(log_lock, "log_lock");
+static IRQ_SPINLOCK_INITIALIZE(log_lock);
 
 /** Overall count of logged messages, which may overflow as needed */
@@ -152,6 +152,6 @@
 {
 	console_lock();
-	spinlock_lock(&log_lock);
-	spinlock_lock(&kio_lock);
+	irq_spinlock_lock(&log_lock, true);
+	irq_spinlock_lock(&kio_lock, true);
 
 	log_current_start = (log_start + log_used) % LOG_LENGTH;
@@ -180,6 +180,6 @@
 
 	kio_push_char('\n');
-	spinlock_unlock(&kio_lock);
-	spinlock_unlock(&log_lock);
+	irq_spinlock_unlock(&kio_lock, true);
+	irq_spinlock_unlock(&log_lock, true);
 
 	/* This has to be called after we released the locks above */
@@ -195,8 +195,8 @@
 		return;
 
-	spinlock_lock(&log_lock);
+	irq_spinlock_lock(&log_lock, true);
 	if (next_for_uspace < log_used)
 		event_notify_0(EVENT_KLOG, true);
-	spinlock_unlock(&log_lock);
+	irq_spinlock_unlock(&log_lock, true);
 }
 
@@ -307,5 +307,5 @@
 		rc = EOK;
 
-		spinlock_lock(&log_lock);
+		irq_spinlock_lock(&log_lock, true);
 
 		while (next_for_uspace < log_used) {
@@ -337,5 +337,5 @@
 		}
 
-		spinlock_unlock(&log_lock);
+		irq_spinlock_unlock(&log_lock, true);
 
 		if (rc != EOK) {