Index: kernel/arch/arm32/src/arm32.c
===================================================================
--- kernel/arch/arm32/src/arm32.c	(revision af9dd1ed6f5d79cc098da33ff7131162b1c177a4)
+++ kernel/arch/arm32/src/arm32.c	(revision b454a22aed9ec21aa9bc6621c9d0609ba5003def)
@@ -35,4 +35,5 @@
 
 #include <arch.h>
+#include <arch/arch.h>
 #include <config.h>
 #include <genarch/fb/fb.h>
@@ -51,6 +52,19 @@
 #include <sysinfo/sysinfo.h>
 
+static void arm32_pre_mm_init(void);
+static void arm32_post_mm_init(void);
+static void arm32_post_smp_init(void);
+
+arch_ops_t arm32_ops = {
+	.pre_mm_init = arm32_pre_mm_init,
+	.post_mm_init = arm32_post_mm_init,
+	.post_smp_init = arm32_post_smp_init,
+};
+
+arch_ops_t *arch_ops = &arm32_ops;
+
+
 /** Performs arm32-specific initialization before main_bsp() is called. */
-void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
+void arm32_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
 {
 	init.cnt = min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
@@ -69,5 +83,5 @@
 
 /** Performs arm32 specific initialization before mm is initialized. */
-void arch_pre_mm_init(void)
+void arm32_pre_mm_init(void)
 {
 	/* It is not assumed by default */
@@ -76,5 +90,5 @@
 
 /** Performs arm32 specific initialization afterr mm is initialized. */
-void arch_post_mm_init(void)
+void arm32_post_mm_init(void)
 {
 	machine_init();
@@ -90,23 +104,4 @@
 }
 
-/** Performs arm32 specific tasks needed after cpu is initialized.
- *
- * Currently the function is empty.
- */
-void arch_post_cpu_init(void)
-{
-}
-
-
-/** Performs arm32 specific tasks needed before the multiprocessing is
- * initialized.
- *
- * Currently the function is empty because SMP is not supported.
- */
-void arch_pre_smp_init(void)
-{
-}
-
-
 /** Performs arm32 specific tasks needed after the multiprocessing is
  * initialized.
@@ -114,5 +109,5 @@
  * Currently the function is empty because SMP is not supported.
  */
-void arch_post_smp_init(void)
+void arm32_post_smp_init(void)
 {
 	machine_input_init();
Index: kernel/arch/arm32/src/start.S
===================================================================
--- kernel/arch/arm32/src/start.S	(revision af9dd1ed6f5d79cc098da33ff7131162b1c177a4)
+++ kernel/arch/arm32/src/start.S	(revision b454a22aed9ec21aa9bc6621c9d0609ba5003def)
@@ -63,5 +63,5 @@
 	ldr sp, =temp_stack
 	
-	bl arch_pre_main
+	bl arm32_pre_main
 	
 	#