Index: uspace/lib/c/arch/arm32/src/atomic.c
===================================================================
--- uspace/lib/c/arch/arm32/src/atomic.c	(revision e9bc927c7361ee3b1b592b35e531714b4eeffc89)
+++ uspace/lib/c/arch/arm32/src/atomic.c	(revision 25fdb2d4b3c3247fe62c1154a416ce3a91019563)
@@ -40,41 +40,54 @@
 unsigned long long __atomic_load_8(const volatile void *mem0, int model)
 {
-	const volatile unsigned long long *mem = mem0;
-
-	(void) model;
-
-	unsigned long long ret;
-
-	/*
-	 * The following instructions between labels 1 and 2 constitute a
-	 * Restartable Atomic Seqeunce. Should the sequence be non-atomic,
-	 * the kernel will restart it.
-	 */
-	asm volatile (
-	    "1:\n"
-	    "	adr %[ret], 1b\n"
-	    "	str %[ret], %[rp0]\n"
-	    "	adr %[ret], 2f\n"
-	    "	str %[ret], %[rp1]\n"
-
-	    "	ldrd %[ret], %[addr]\n"
-	    "2:\n"
-	    : [ret] "=&r" (ret),
+	const volatile unsigned *mem = mem0;
+
+	(void) model;
+
+	union {
+		unsigned long long a;
+		unsigned b[2];
+	} ret;
+
+	/*
+	 * The following instructions between labels 1 and 2 constitute a
+	 * Restartable Atomic Seqeunce. Should the sequence be non-atomic,
+	 * the kernel will restart it.
+	 */
+	asm volatile (
+	    "1:\n"
+	    "	adr %[ret0], 1b\n"
+	    "	str %[ret0], %[rp0]\n"
+	    "	adr %[ret0], 2f\n"
+	    "	str %[ret0], %[rp1]\n"
+
+	    "	ldr %[ret0], %[addr0]\n"
+	    "   ldr %[ret1], %[addr1]\n"
+	    "2:\n"
+	    : [ret0] "=&r" (ret.b[0]),
+	      [ret1] "=&r" (ret.b[1]),
 	      [rp0] "=m" (ras_page[0]),
 	      [rp1] "=m" (ras_page[1])
-	    : [addr] "m" (*mem)
-	);
-
-	ras_page[0] = 0;
-	ras_page[1] = 0xffffffff;
-
-	return ret;
+	    : [addr0] "m" (mem[0]),
+	      [addr1] "m" (mem[1])
+	);
+
+	ras_page[0] = 0;
+	ras_page[1] = 0xffffffff;
+
+	return ret.a;
 }
 
 void __atomic_store_8(volatile void *mem0, unsigned long long val, int model)
 {
-	volatile unsigned long long *mem = mem0;
-
-	(void) model;
+	volatile unsigned *mem = mem0;
+
+	(void) model;
+
+	union {
+		unsigned long long a;
+		unsigned b[2];
+	} v;
+
+	v.a = val;
 
 	/* scratch register */
@@ -93,11 +106,14 @@
 	    "	str %[tmp], %[rp1]\n"
 
-	    "	strd %[imm], %[addr]\n"
+	    "	str %[val0], %[addr0]\n"
+	    "   str %[val1], %[addr1]\n"
 	    "2:\n"
 	    : [tmp] "=&r" (tmp),
 	      [rp0] "=m" (ras_page[0]),
 	      [rp1] "=m" (ras_page[1]),
-	      [addr] "=m" (*mem)
-	    : [imm] "r" (val)
+	      [addr0] "=m" (mem[0]),
+	      [addr1] "=m" (mem[1])
+	    : [val0] "r" (v.b[0]),
+	      [val1] "r" (v.b[1])
 	);