diff --git a/src/system/kernel/arch/arm/arch_commpage.cpp b/src/system/kernel/arch/arm/arch_commpage.cpp
index f23962aecb..412edd235f 100644
--- a/src/system/kernel/arch/arm/arch_commpage.cpp
+++ b/src/system/kernel/arch/arm/arch_commpage.cpp
@@ -31,6 +31,6 @@ status_t
 arch_commpage_init_post_cpus(void)
 {
 #warning ARM:IMPLEMENTME
-        return B_OK;
+	return B_OK;
 }
 
diff --git a/src/system/kernel/arch/arm/arch_cpu.cpp b/src/system/kernel/arch/arm/arch_cpu.cpp
index 49bcd81550..e225f9cef8 100644
--- a/src/system/kernel/arch/arm/arch_cpu.cpp
+++ b/src/system/kernel/arch/arm/arch_cpu.cpp
@@ -23,7 +23,7 @@ int arch_fpu_type;
 int arch_mmu_type;
 int arch_platform;
 
-status_t 
+status_t
 arch_cpu_preboot_init_percpu(kernel_args *args, int curr_cpu)
 {
 	// enable FPU
@@ -37,7 +37,7 @@ arch_cpu_preboot_init_percpu(kernel_args *args, int curr_cpu)
 }
 
 
-status_t 
+status_t
 arch_cpu_init_percpu(kernel_args *args, int curr_cpu)
 {
 	if (curr_cpu != 0)
@@ -96,11 +96,12 @@ arch_cpu_shutdown(bool reboot)
 }
 
 
-void 
+void
 arch_cpu_sync_icache(void *address, size_t len)
 {
 	uint32 Rd = 0;
-	asm volatile ("mcr p15, 0, %[c7format], c7, c5, 0" : : [c7format] "r" (Rd) );
+	asm volatile ("mcr p15, 0, %[c7format], c7, c5, 0"
+		: : [c7format] "r" (Rd) );
 }
 
 
@@ -118,41 +119,45 @@ arch_cpu_memory_write_barrier(void)
 }
 
 
-void 
+void
 arch_cpu_invalidate_TLB_range(addr_t start, addr_t end)
 {
 	int32 num_pages = end / B_PAGE_SIZE - start / B_PAGE_SIZE;
 	while (num_pages-- >= 0) {
-		asm volatile ("mcr p15, 0, %[c8format], c8, c6, 1" : : [c8format] "r" (start) );
+		asm volatile ("mcr p15, 0, %[c8format], c8, c6, 1"
+			: : [c8format] "r" (start) );
 		start += B_PAGE_SIZE;
 	}
 }
 
 
-void 
+void
 arch_cpu_invalidate_TLB_list(addr_t pages[], int num_pages)
 {
-	for (int i = 0; i < num_pages; i++)
-		asm volatile ("mcr p15, 0, %[c8format], c8, c6, 1" : : [c8format] "r" (pages[i]) );
+	for (int i = 0; i < num_pages; i++) {
+		asm volatile ("mcr p15, 0, %[c8format], c8, c6, 1":
+			: [c8format] "r" (pages[i]) );
+	}
 }
 
 
-void 
+void
 arch_cpu_global_TLB_invalidate(void)
 {
 	uint32 Rd = 0;
-	asm volatile ("mcr p15, 0, %[c8format], c8, c7, 0" : : [c8format] "r" (Rd) );
+	asm volatile ("mcr p15, 0, %[c8format], c8, c7, 0"
+		: : [c8format] "r" (Rd) );
 }
 
 
-void 
+void
 arch_cpu_user_TLB_invalidate(void)
 {/*
 	cpu_ops.flush_insn_pipeline();
 	cpu_ops.flush_atc_user();
 	cpu_ops.flush_insn_pipeline();
 */
-#warning WRITEME 
+#warning WRITEME
 }
 
 
@@ -160,7 +165,7 @@ status_t
 arch_cpu_user_memcpy(void *to, const void *from, size_t size,
 	addr_t *faultHandler)
 {
-#warning WRITEME 
+#warning WRITEME
 /*
 	char *tmp = (char *)to;
 	char *s = (char *)from;
@@ -187,14 +192,15 @@ error:
  *	\param to Pointer to the destination C-string.
  *	\param from Pointer to the source C-string.
  *	\param size Size in bytes of the string buffer pointed to by \a to.
- *	
+ *
  *	\return strlen(\a from).
  */
 
 ssize_t
-arch_cpu_user_strlcpy(char *to, const char *from, size_t size, addr_t *faultHandler)
+arch_cpu_user_strlcpy(char *to, const char *from,
+	size_t size, addr_t *faultHandler)
 {
-#warning WRITEME 
+#warning WRITEME
 /*
 	int from_length = 0;
 	addr_t oldFaultHandler = *faultHandler;
@@ -226,7 +232,7 @@ error:
 status_t
 arch_cpu_user_memset(void *s, char c, size_t count, addr_t *faultHandler)
 {
-#warning WRITEME 
+#warning WRITEME
 
 /*
 	char *xs = (char *)s;
diff --git a/src/system/kernel/arch/arm/arch_debug.cpp b/src/system/kernel/arch/arm/arch_debug.cpp
index 1951b7b085..0b6449053a 100644
--- a/src/system/kernel/arch/arm/arch_debug.cpp
+++ b/src/system/kernel/arch/arm/arch_debug.cpp
@@ -27,8 +27,9 @@ struct stack_frame {
 #define NUM_PREVIOUS_LOCATIONS 32
 
 extern struct iframe_stack gBootFrameStack;
-/*
 
+
+/*
 static bool
 already_visited(uint32 *visited, int32 *_last, int32 *_num, uint32 framePointer)
 {
diff --git a/src/system/kernel/arch/arm/arch_debug_console.cpp b/src/system/kernel/arch/arm/arch_debug_console.cpp
index 6420aa8ac7..8ae632a1b9 100644
--- a/src/system/kernel/arch/arm/arch_debug_console.cpp
+++ b/src/system/kernel/arch/arm/arch_debug_console.cpp
@@ -100,4 +100,3 @@ arch_debug_console_init_settings(kernel_args *args)
 {
 	return B_OK;
 }
-
diff --git a/src/system/kernel/arch/arm/arch_elf.cpp b/src/system/kernel/arch/arm/arch_elf.cpp
index 1cd1dc5085..a64d0fae5a 100644
--- a/src/system/kernel/arch/arm/arch_elf.cpp
+++ b/src/system/kernel/arch/arm/arch_elf.cpp
@@ -316,78 +316,78 @@ arch_elf_relocate_rela(struct elf_image_info *image,
 	struct elf_image_info *resolve_image, struct Elf32_Rela *rel, int rel_len)
 #endif
 {
-        int i;
-        struct Elf32_Sym *sym;
-        int vlErr;
-        addr_t S = 0;   // symbol address
-        addr_t R = 0;   // section relative symbol address
+	int i;
+	struct Elf32_Sym *sym;
+	int vlErr;
+	addr_t S = 0;   // symbol address
+	addr_t R = 0;   // section relative symbol address
 
-        addr_t G = 0;   // GOT address
-        addr_t L = 0;   // PLT address
+	addr_t G = 0;   // GOT address
+	addr_t L = 0;   // PLT address
 
-        #define P       ((addr_t)(image->text_region.delta + rel[i].r_offset))
-        #define A       ((addr_t)rel[i].r_addend)
-        #define B       (image->text_region.delta)
-#warning ARM:define T correctly for thumb!!!
-	#define	T	0
+	#define P ((addr_t)(image->text_region.delta + rel[i].r_offset))
+	#define A ((addr_t)rel[i].r_addend)
+	#define B (image->text_region.delta)
+	#warning ARM:define T correctly for thumb!!!
+	#define	T 0
 
-        // TODO: Get the GOT address!
-        #define REQUIRE_GOT     \
-                if (G == 0) {   \
-                        dprintf("arch_elf_relocate_rela(): Failed to get GOT address!\n"); \
-                        return B_ERROR; \
-                }
+	// TODO: Get the GOT address!
+	#define REQUIRE_GOT     \
+		if (G == 0) {   \
+			dprintf("arch_elf_relocate_rela(): Failed to get GOT address!\n"); \
+			return B_ERROR; \
+		}
 
-        // TODO: Get the PLT address!
-        #define REQUIRE_PLT     \
-                if (L == 0) {   \
-                        dprintf("arch_elf_relocate_rela(): Failed to get PLT address!\n"); \
-                        return B_ERROR; \
-                }
+	// TODO: Get the PLT address!
+	#define REQUIRE_PLT     \
+	if (L == 0) {   \
+		dprintf("arch_elf_relocate_rela(): Failed to get PLT address!\n"); \
+		return B_ERROR; \
+	}
 
-        for (i = 0; i * (int)sizeof(struct Elf32_Rela) < rel_len; i++) {
-#if CHATTY
-                dprintf("looking at rel type %d, offset 0x%lx, sym 0x%lx, addend 0x%lx\n",
-                        ELF32_R_TYPE(rel[i].r_info), rel[i].r_offset, ELF32_R_SYM(rel[i].r_info), rel[i].r_addend);
-#endif
-                switch (ELF32_R_TYPE(rel[i].r_info)) {
-#warning ARM:ADDOTHERREL
-                        case R_ARM_GLOB_DAT:
-                                sym = SYMBOL(image, ELF32_R_SYM(rel[i].r_info));
-
-#ifdef _BOOT_MODE
-                                vlErr = boot_elf_resolve_symbol(image, sym, &S);
-#else
-                                vlErr = elf_resolve_symbol(image, sym, resolve_image, &S);
-#endif
-                                if (vlErr < 0) {
-                                        dprintf("%s(): Failed to relocate "
-                                                "entry index %d, rel type %d, offset 0x%lx, sym 0x%lx, "
-                                                "addend 0x%lx\n", __FUNCTION__, i, ELF32_R_TYPE(rel[i].r_info),
-                                                rel[i].r_offset, ELF32_R_SYM(rel[i].r_info),
-                                                rel[i].r_addend);
-                                        return vlErr;
-                                }
-                                break;
-                }
-
-#warning ARM:ADDOTHERREL
-                switch (ELF32_R_TYPE(rel[i].r_info)) {
+	for (i = 0; i * (int)sizeof(struct Elf32_Rela) < rel_len; i++) {
+		#if CHATTY
+		dprintf("looking at rel type %d, offset 0x%lx, "
+		"sym 0x%lx, addend 0x%lx\n", ELF32_R_TYPE(rel[i].r_info),
+		rel[i].r_offset, ELF32_R_SYM(rel[i].r_info), rel[i].r_addend);
+		#endif
+		switch (ELF32_R_TYPE(rel[i].r_info)) {
+		#warning ARM:ADDOTHERREL
 			case R_ARM_GLOB_DAT:
-				write_32(P,(S + A) | T);
+				sym = SYMBOL(image, ELF32_R_SYM(rel[i].r_info));
+
+				#ifdef _BOOT_MODE
+				vlErr = boot_elf_resolve_symbol(image, sym, &S);
+				#else
+				vlErr = elf_resolve_symbol(image, sym, resolve_image, &S);
+				#endif
+				if (vlErr < 0) {
+					dprintf("%s(): Failed to relocate "
+						"entry index %d, rel type %d, offset 0x%lx, sym 0x%lx, "
+						"addend 0x%lx\n", __FUNCTION__, i,
+						ELF32_R_TYPE(rel[i].r_info), rel[i].r_offset,
+						ELF32_R_SYM(rel[i].r_info), rel[i].r_addend);
+					return vlErr;
+				}
+				break;
+		}
+
+		#warning ARM:ADDOTHERREL
+		switch (ELF32_R_TYPE(rel[i].r_info)) {
+			case R_ARM_GLOB_DAT:
+				write_32(P, (S + A) | T);
 				break;
 
-                        case R_ARM_NONE:
-                                break;
+			case R_ARM_NONE:
+				break;
 
 			default:
-                                dprintf("arch_elf_relocate_rela(): unhandled "
-					"relocation type %d!\n", 
-					ELF32_R_TYPE(rel[i].r_info));
-                                return B_ERROR;
+				dprintf("arch_elf_relocate_rela(): unhandled "
+					"relocation type %d!\n", ELF32_R_TYPE(rel[i].r_info));
+				return B_ERROR;
 		}
-}
-#warning ARM: FIXME!!!!!!!
+	}
+
+	#warning ARM: FIXME!!!!!!!
 	return B_NO_ERROR;
 }
-
diff --git a/src/system/kernel/arch/arm/arch_int.cpp b/src/system/kernel/arch/arm/arch_int.cpp
index 0bd3333100..1337705665 100644
--- a/src/system/kernel/arch/arm/arch_int.cpp
+++ b/src/system/kernel/arch/arm/arch_int.cpp
@@ -29,8 +29,6 @@
 #include <vm/VMAddressSpace.h>
 #include <string.h>
 
-#warning M68K: writeme!
-
 
 //#define TRACE_ARCH_INT
 #ifdef TRACE_ARCH_INT
@@ -70,7 +68,7 @@ struct iframe_stack gBootFrameStack;
 void
 arch_int_enable_io_interrupt(int irq)
 {
-#warning ARM WRITEME
+	#warning ARM WRITEME
 	//if (!sPIC)
 	//	return;
 
@@ -83,7 +81,7 @@ arch_int_enable_io_interrupt(int irq)
 void
 arch_int_disable_io_interrupt(int irq)
 {
-#warning ARM WRITEME
+	#warning ARM WRITEME
 
 	//if (!sPIC)
 	//	return;
@@ -99,35 +97,41 @@ arch_int_disable_io_interrupt(int irq)
 static void
 print_iframe(struct iframe *frame)
 {
-/*
-	dprintf("r0-r3:   0x%08lx 0x%08lx 0x%08lx 0x%08lx\n", frame->r0, frame->r1, frame->r2, frame->r3);
-	dprintf("r4-r7:   0x%08lx 0x%08lx 0x%08lx 0x%08lx\n", frame->r4, frame->r5, frame->r6, frame->r7);
-	dprintf("r8-r11:  0x%08lx 0x%08lx 0x%08lx 0x%08lx\n", frame->r8, frame->r9, frame->r10, frame->r11);
-	dprintf("r12-r15: 0x%08lx 0x%08lx 0x%08lx 0x%08lx\n", frame->r12, frame->r13, frame->a6, frame->a7);
+	#if 0
+	dprintf("r0-r3:   0x%08lx 0x%08lx 0x%08lx 0x%08lx\n", frame->r0, frame->r1,
+		frame->r2, frame->r3);
+	dprintf("r4-r7:   0x%08lx 0x%08lx 0x%08lx 0x%08lx\n", frame->r4, frame->r5,
+		frame->r6, frame->r7);
+	dprintf("r8-r11:  0x%08lx 0x%08lx 0x%08lx 0x%08lx\n", frame->r8, frame->r9,
+		frame->r10, frame->r11);
+	dprintf("r12-r15: 0x%08lx 0x%08lx 0x%08lx 0x%08lx\n", frame->r12, frame->r13,
+		frame->a6, frame->a7);
 	dprintf("      pc 0x%08lx         sr 0x%08lx\n", frame->pc, frame->sr);
-*/
+	#endif
 
-#warning ARM WRITEME
+	#warning ARM WRITEME
 }
 
 
 status_t
 arch_int_init(kernel_args *args)
 {
+	#if 0
 	status_t err;
 	addr_t vbr;
 	int i;
 
-//	gExceptionVectors = (m68k_exception_handler *)args->arch_args.vir_vbr;
+	gExceptionVectors = (m68k_exception_handler *)args->arch_args.vir_vbr;
 
 	/* fill in the vector table */
-//	for (i = 0; i < M68K_EXCEPTION_VECTOR_COUNT; i++)
-//		gExceptionVectors[i] = &__m68k_exception_common;
+	for (i = 0; i < M68K_EXCEPTION_VECTOR_COUNT; i++)
+		gExceptionVectors[i] = &__m68k_exception_common;
 
-//	vbr = args->arch_args.phys_vbr;
+	vbr = args->arch_args.phys_vbr;
 	/* point VBR to the new table */
-//	asm volatile  ("movec %0,%%vbr" : : "r"(vbr):);
-#warning ARM WRITEME
+	asm volatile  ("movec %0,%%vbr" : : "r"(vbr):);
+	#endif
+	#warning ARM WRITEME
 
 	return B_OK;
 }
@@ -137,8 +141,8 @@ status_t
 arch_int_init_post_vm(kernel_args *args)
 {
 	status_t err;
-//	err = M68KPlatform::Default()->InitPIC(args);
-#warning ARM WRITEME
+	// err = M68KPlatform::Default()->InitPIC(args);
+	#warning ARM WRITEME
 
 	return err;
 }
@@ -159,5 +163,3 @@ arch_int_init_post_device_manager(struct kernel_args *args)
 
 	return B_ENTRY_NOT_FOUND;
 }
-
-
diff --git a/src/system/kernel/arch/arm/arch_platform.cpp b/src/system/kernel/arch/arm/arch_platform.cpp
index 8e971dc4fe..f3721a6aca 100644
--- a/src/system/kernel/arch/arm/arch_platform.cpp
+++ b/src/system/kernel/arch/arm/arch_platform.cpp
@@ -17,7 +17,8 @@
 #include <real_time_clock.h>
 #include <util/kernel_cpp.h>
 
-/*
+
+#if 0
 static M68KPlatform *sM68KPlatform;
 
 
@@ -25,15 +26,17 @@ static M68KPlatform *sM68KPlatform;
 M68KPlatform::M68KPlatform(platform_type platformType,
 	m68k_platform_type m68kPlatformType)
 	: fPlatformType(platformType),
-	  fM68KPlatformType(m68kPlatformType)
+	fM68KPlatformType(m68kPlatformType)
 {
 }
 
+
 // destructor
 M68KPlatform::~M68KPlatform()
 {
 }
 
+
 // Default
 M68KPlatform *
 M68KPlatform::Default()
@@ -43,13 +46,12 @@ M68KPlatform::Default()
 
 
 // # pragma mark -
-*/
+#endif
 
 status_t
 arch_platform_init(struct kernel_args *kernelArgs)
 {
-#warning ARM:WRITEME
-
+	#warning ARM:WRITEME
 	return B_OK;
 }
 
@@ -57,9 +59,9 @@ arch_platform_init(struct kernel_args *kernelArgs)
 status_t
 arch_platform_init_post_vm(struct kernel_args *kernelArgs)
 {
+	#warning ARM:WRITEME
+	//sM68KPlatform->InitPostVM(kernelArgs);
 	return B_OK;
-#warning ARM:WRITEME
-//sM68KPlatform->InitPostVM(kernelArgs);
 }
 
 
diff --git a/src/system/kernel/arch/arm/arch_real_time_clock.cpp b/src/system/kernel/arch/arm/arch_real_time_clock.cpp
index 9e445b7aa8..584bec9ffb 100644
--- a/src/system/kernel/arch/arm/arch_real_time_clock.cpp
+++ b/src/system/kernel/arch/arm/arch_real_time_clock.cpp
@@ -7,12 +7,14 @@
  * Distributed under the terms of the MIT License.
  */
 
+
 #include <arch/real_time_clock.h>
 
 #include <real_time_clock.h>
 #include <real_time_data.h>
 #include <smp.h>
 
+
 status_t
 arch_rtc_init(kernel_args *args, struct real_time_data *data)
 {
diff --git a/src/system/kernel/arch/arm/arch_smp.cpp b/src/system/kernel/arch/arm/arch_smp.cpp
index 3a14e963d1..e3d318bd2b 100644
--- a/src/system/kernel/arch/arm/arch_smp.cpp
+++ b/src/system/kernel/arch/arm/arch_smp.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2007, Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
@@ -43,4 +43,3 @@ arch_smp_send_broadcast_ici()
 {
 	panic("called arch_smp_send_broadcast_ici\n");
 }
-
diff --git a/src/system/kernel/arch/arm/arch_system_info.cpp b/src/system/kernel/arch/arm/arch_system_info.cpp
index 773a2fbd17..0fd45695bf 100644
--- a/src/system/kernel/arch/arm/arch_system_info.cpp
+++ b/src/system/kernel/arch/arm/arch_system_info.cpp
@@ -9,6 +9,7 @@
  * All rights reserved. Distributed under the terms of the MIT License.
  */
 
+
 #include <OS.h>
 
 #include <arch_cpu.h>
diff --git a/src/system/kernel/arch/arm/arch_thread.cpp b/src/system/kernel/arch/arm/arch_thread.cpp
index 42ba0589c8..3d3d38cecf 100644
--- a/src/system/kernel/arch/arm/arch_thread.cpp
+++ b/src/system/kernel/arch/arm/arch_thread.cpp
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#warning M68K: writeme!
+
 // Valid initial arch_thread state. We just memcpy() it when initializing
 // a new thread structure.
 static struct arch_thread sInitialState;
@@ -82,17 +82,20 @@ arch_thread_init_tls(Thread *thread)
 void
 arch_thread_context_switch(Thread *from, Thread *to)
 {
-/*	addr_t newPageDirectory;
+	#if 0
+	addr_t newPageDirectory;
 
 	newPageDirectory = (addr_t)m68k_next_page_directory(from, to);
 
 	if ((newPageDirectory % B_PAGE_SIZE) != 0)
-		panic("arch_thread_context_switch: bad pgdir 0x%lx\n", newPageDirectory);
-#warning M68K: export from arch_vm.c
+		panic("arch_thread_context_switch: bad pgdir 0x%lx\n",
+			newPageDirectory);
+	#warning M68K: export from arch_vm.c
 	m68k_set_pgdir(newPageDirectory);
-	m68k_context_switch(&from->arch_info.sp, to->arch_info.sp);*/
-#warning ARM:WRITEME
+	m68k_context_switch(&from->arch_info.sp, to->arch_info.sp);
+	#endif
 
+	#warning ARM:WRITEME
 }
 
 
@@ -106,7 +109,8 @@ arch_thread_dump_info(void *info)
 
 
 status_t
-arch_thread_enter_userspace(Thread *thread, addr_t entry, void *arg1, void *arg2)
+arch_thread_enter_userspace(Thread *thread, addr_t entry,
+	void *arg1, void *arg2)
 {
 	panic("arch_thread_enter_uspace(): not yet implemented\n");
 	return B_ERROR;
@@ -145,7 +149,6 @@ arch_check_syscall_restart(Thread *thread)
  *	arch_fork_arg structure to be passed to arch_restore_fork_frame().
  *	Also makes sure to return the right value.
  */
-
 void
 arch_store_fork_frame(struct arch_fork_arg *arg)
 {
@@ -159,9 +162,7 @@ arch_store_fork_frame(struct arch_fork_arg *arg)
  *	This function does not return to the caller, but will enter userland
  *	in the child team at the same position where the parent team left of.
  */
-
 void
 arch_restore_fork_frame(struct arch_fork_arg *arg)
 {
 }
-
diff --git a/src/system/kernel/arch/arm/arch_timer.cpp b/src/system/kernel/arch/arm/arch_timer.cpp
index 5ef99fbff7..7224c90c20 100644
--- a/src/system/kernel/arch/arm/arch_timer.cpp
+++ b/src/system/kernel/arch/arm/arch_timer.cpp
@@ -19,29 +19,27 @@
 //#include <arch_platform.h>
 
 
-void 
+void
 arch_timer_set_hardware_timer(bigtime_t timeout)
 {
-#warning ARM:WRITEME
-
-//	M68KPlatform::Default()->SetHardwareTimer(timeout);
+	#warning ARM:WRITEME
+	// M68KPlatform::Default()->SetHardwareTimer(timeout);
 }
 
 
-void 
+void
 arch_timer_clear_hardware_timer()
 {
-#warning ARM:WRITEME
-//	M68KPlatform::Default()->ClearHardwareTimer();
+	#warning ARM:WRITEME
+	// M68KPlatform::Default()->ClearHardwareTimer();
 }
 
 
-int 
+int
 arch_init_timer(kernel_args *args)
 {
-#warning ARM:WRITEME
-
+	#warning ARM:WRITEME
+	// M68KPlatform::Default()->InitTimer(args);
 	return 0;
-//M68KPlatform::Default()->InitTimer(args);
 }
 
diff --git a/src/system/kernel/arch/arm/arch_user_debugger.cpp b/src/system/kernel/arch/arm/arch_user_debugger.cpp
index dfc0f37038..5ae6e79b2f 100644
--- a/src/system/kernel/arch/arm/arch_user_debugger.cpp
+++ b/src/system/kernel/arch/arm/arch_user_debugger.cpp
@@ -14,6 +14,8 @@
 
 
 #warning ARM: WRITEME
+
+
 void
 arch_clear_team_debug_info(struct arch_team_debug_info *info)
 {
@@ -61,11 +63,10 @@ arch_get_debug_cpu_state(debug_cpu_state *cpuState)
 status_t
 arch_get_thread_debug_cpu_state(Thread *thread, debug_cpu_state *cpuState)
 {
-        return B_ERROR;
+	return B_ERROR;
 }
 
 
-
 status_t
 arch_set_breakpoint(void *address)
 {
@@ -93,6 +94,7 @@ arch_clear_watchpoint(void *address)
 	return B_ERROR;
 }
 
+
 bool
 arch_has_breakpoints(struct arch_team_debug_info *info)
 {
diff --git a/src/system/kernel/arch/arm/arch_vm.cpp b/src/system/kernel/arch/arm/arch_vm.cpp
index 5f58be4328..340ae784d0 100644
--- a/src/system/kernel/arch/arm/arch_vm.cpp
+++ b/src/system/kernel/arch/arm/arch_vm.cpp
@@ -9,6 +9,7 @@
  * Distributed under the terms of the NewOS License.
  */
 
+
 #include <KernelExport.h>
 
 #include <kernel.h>
@@ -27,7 +28,8 @@
 #	define TRACE(x) ;
 #endif
 
-#warning M68K: WRITEME
+#warning ARM: WRITEME
+
 
 status_t
 arch_vm_init(kernel_args *args)
@@ -39,11 +41,11 @@ arch_vm_init(kernel_args *args)
 status_t
 arch_vm_init2(kernel_args *args)
 {
-//	int bats[8];
-//	int i;
+	//	int bats[8];
+	//	int i;
 
 	/**/
-#warning M68K: disable TT0 and TT1, set up pmmu
+	#warning ARM: WRITEME
 
 	return B_OK;
 }
@@ -59,8 +61,7 @@ arch_vm_init_post_area(kernel_args *args)
 status_t
 arch_vm_init_end(kernel_args *args)
 {
-
-#warning M68K: unset TT0 now
+	#warning ARM: WRITEME
 	return B_OK;
 }
 
@@ -75,8 +76,8 @@ arch_vm_init_post_modules(kernel_args *args)
 void
 arch_vm_aspace_swap(struct VMAddressSpace *from, struct VMAddressSpace *to)
 {
-#warning ARM:WRITEME
-//	m68k_set_pgdir(m68k_translation_map_get_pgdir(&to->TranslationMap()));
+	#warning ARM:WRITEME
+	// m68k_set_pgdir(m68k_translation_map_get_pgdir(&to->TranslationMap()));
 }
 
 
diff --git a/src/system/kernel/arch/arm/arch_vm_translation_map.cpp b/src/system/kernel/arch/arm/arch_vm_translation_map.cpp
index f8181fcfe5..faad4bf263 100644
--- a/src/system/kernel/arch/arm/arch_vm_translation_map.cpp
+++ b/src/system/kernel/arch/arm/arch_vm_translation_map.cpp
@@ -28,9 +28,9 @@
 static union {
 	uint64	align;
 	char	thirty_two[sizeof(ARMPagingMethod32Bit)];
-#if B_HAIKU_PHYSICAL_BITS == 64
+	#if B_HAIKU_PHYSICAL_BITS == 64
 	char	pae[sizeof(ARMPagingMethodPAE)];
-#endif
+	#endif
 } sPagingMethodBuffer;
 
 
@@ -50,7 +50,7 @@ arch_vm_translation_map_init(kernel_args *args,
 {
 	TRACE("vm_translation_map_init: entry\n");
 
-#ifdef TRACE_VM_TMAP
+	#ifdef TRACE_VM_TMAP
 	TRACE("physical memory ranges:\n");
 	for (uint32 i = 0; i < args->num_physical_memory_ranges; i++) {
 		phys_addr_t start = args->physical_memory_range[i].start;
@@ -73,9 +73,9 @@ arch_vm_translation_map_init(kernel_args *args,
 		addr_t end = start + args->virtual_allocated_range[i].size;
 		TRACE("  %#10" B_PRIxADDR " - %#10" B_PRIxADDR "\n", start, end);
 	}
-#endif
+	#endif
 
-#if B_HAIKU_PHYSICAL_BITS == 64 //IRA: Check all 64 bit code and adjust for ARM
+	#if B_HAIKU_PHYSICAL_BITS == 64 //IRA: Check 64 bit code and adjust for ARM
 	bool paeAvailable = x86_check_feature(IA32_FEATURE_PAE, FEATURE_COMMON);
 	bool paeNeeded = false;
 	for (uint32 i = 0; i < args->num_physical_memory_ranges; i++) {
@@ -95,9 +95,9 @@ arch_vm_translation_map_init(kernel_args *args,
 			paeNeeded ? "available" : "needed");
 		gARMPagingMethod = new(&sPagingMethodBuffer) ARMPagingMethod32Bit;
 	}
-#else
+	#else
 	gARMPagingMethod = new(&sPagingMethodBuffer) ARMPagingMethod32Bit;
-#endif
+	#endif
 
 	return gARMPagingMethod->Init(args, _physicalPageMapper);
 }
diff --git a/src/system/kernel/arch/arm/uart.cpp b/src/system/kernel/arch/arm/uart.cpp
index c4a80c6e90..d05263cb26 100644
--- a/src/system/kernel/arch/arm/uart.cpp
+++ b/src/system/kernel/arch/arm/uart.cpp
@@ -20,72 +20,83 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+
+
 #include <debug.h>
 #include <arch/arm/reg.h>
 #include <arch/arm/uart.h>
 #include <board_config.h>
 //#include <target/debugconfig.h>
 
+
 #define DEBUG_UART BOARD_DEBUG_UART
 
+
 struct uart_stat {
 	addr_t base;
 	uint shift;
 };
 
+
 static struct uart_stat uart[3] = {
 	{ BOARD_UART1_BASE, 2 },
 	{ BOARD_UART2_BASE, 2 },
 	{ BOARD_UART3_BASE, 2 },
 };
 
+
 static inline void write_uart_reg(int port, uint reg, unsigned char data)
 {
-	*(volatile unsigned char *)(uart[port].base + (reg << uart[port].shift)) = data;
+	*(volatile unsigned char *)(uart[port].base + (reg << uart[port].shift))
+		= data;
 }
 
+
 static inline unsigned char read_uart_reg(int port, uint reg)
 {
-	return *(volatile unsigned char *)(uart[port].base + (reg << uart[port].shift));
+	return *(volatile unsigned char *)(uart[port].base
+		+ (reg << uart[port].shift));
 }
 
+
 #define LCR_8N1		0x03
 
-#define FCR_FIFO_EN     0x01		/* Fifo enable */
-#define FCR_RXSR        0x02		/* Receiver soft reset */
-#define FCR_TXSR        0x04		/* Transmitter soft reset */
+#define FCR_FIFO_EN	0x01	/* Fifo enable */
+#define FCR_RXSR	0x02	/* Receiver soft reset */
+#define FCR_TXSR	0x04	/* Transmitter soft reset */
 
-#define MCR_DTR         0x01
-#define MCR_RTS         0x02
-#define MCR_DMA_EN      0x04
-#define MCR_TX_DFR      0x08
+#define MCR_DTR		0x01
+#define MCR_RTS		0x02
+#define MCR_DMA_EN	0x04
+#define MCR_TX_DFR	0x08
 
-#define LCR_WLS_MSK	0x03		/* character length select mask */
-#define LCR_WLS_5	0x00		/* 5 bit character length */
-#define LCR_WLS_6	0x01		/* 6 bit character length */
-#define LCR_WLS_7	0x02		/* 7 bit character length */
-#define LCR_WLS_8	0x03		/* 8 bit character length */
-#define LCR_STB		0x04		/* Number of stop Bits, off = 1, on = 1.5 or 2) */
-#define LCR_PEN		0x08		/* Parity eneble */
-#define LCR_EPS		0x10		/* Even Parity Select */
-#define LCR_STKP	0x20		/* Stick Parity */
-#define LCR_SBRK	0x40		/* Set Break */
-#define LCR_BKSE	0x80		/* Bank select enable */
+#define LCR_WLS_MSK	0x03	/* character length select mask */
+#define LCR_WLS_5	0x00	/* 5 bit character length */
+#define LCR_WLS_6	0x01	/* 6 bit character length */
+#define LCR_WLS_7	0x02	/* 7 bit character length */
+#define LCR_WLS_8	0x03	/* 8 bit character length */
+#define LCR_STB		0x04	/* Number of stop Bits, off = 1, on = 1.5 or 2) */
+#define LCR_PEN		0x08	/* Parity eneble */
+#define LCR_EPS		0x10	/* Even Parity Select */
+#define LCR_STKP	0x20	/* Stick Parity */
+#define LCR_SBRK	0x40	/* Set Break */
+#define LCR_BKSE	0x80	/* Bank select enable */
 
-#define LSR_DR		0x01		/* Data ready */
-#define LSR_OE		0x02		/* Overrun */
-#define LSR_PE		0x04		/* Parity error */
-#define LSR_FE		0x08		/* Framing error */
-#define LSR_BI		0x10		/* Break */
-#define LSR_THRE	0x20		/* Xmit holding register empty */
-#define LSR_TEMT	0x40		/* Xmitter empty */
-#define LSR_ERR		0x80		/* Error */
+#define LSR_DR		0x01	/* Data ready */
+#define LSR_OE		0x02	/* Overrun */
+#define LSR_PE		0x04	/* Parity error */
+#define LSR_FE		0x08	/* Framing error */
+#define LSR_BI		0x10	/* Break */
+#define LSR_THRE	0x20	/* Xmit holding register empty */
+#define LSR_TEMT	0x40	/* Xmitter empty */
+#define LSR_ERR		0x80	/* Error */
 
-#define LCRVAL LCR_8N1					/* 8 data, 1 stop, no parity */
-#define MCRVAL (MCR_DTR | MCR_RTS)			/* RTS/DTR */
-#define FCRVAL (FCR_FIFO_EN | FCR_RXSR | FCR_TXSR)	/* Clear & enable FIFOs */
+#define LCRVAL LCR_8N1				/* 8 data, 1 stop, no parity */
+#define MCRVAL (MCR_DTR | MCR_RTS)	/* RTS/DTR */
+#define FCRVAL (FCR_FIFO_EN | FCR_RXSR | FCR_TXSR) /* Clear & enable FIFOs */
+
+#define V_NS16550_CLK            (48000000) /* 48MHz (APLL96/2) */
 
-#define V_NS16550_CLK            (48000000)  /* 48MHz (APLL96/2) */
 
 int uart_debug_port(void)
 {
@@ -111,9 +122,10 @@ void uart_init_port(int port, uint baud)
 //	write_uart_reg(port, UART_LCR, LCRVAL); // operational mode
 }
 
+
 void uart_init_early(void)
 {
-#if BOARD_CPU_OMAP3
+	#if BOARD_CPU_OMAP3
 	/* UART1 */
 	RMWREG32(CM_FCLKEN1_CORE, 13, 1, 1);
 	RMWREG32(CM_ICLKEN1_CORE, 13, 1, 1);
@@ -125,32 +137,33 @@ void uart_init_early(void)
 	/* UART3 */
 	RMWREG32(CM_FCLKEN_PER, 11, 1, 1);
 	RMWREG32(CM_ICLKEN_PER, 11, 1, 1);
-#else
-#warning INTITIALIZE UART!!!!!
-#endif
-
+	#else
+	#warning INTITIALIZE UART!!!!!
+	#endif
 
 	uart_init_port(DEBUG_UART, 115200);
 }
 
+
 void uart_init(void)
 {
 }
 
+
 int uart_putc(int port, char c )
 {
-
-	while (!(read_uart_reg(port, UART_LSR) & (1<<6))) // wait for the last char to get out
-		;
-  	write_uart_reg(port, UART_THR, c);
+	while (!(read_uart_reg(port, UART_LSR) & (1<<6)));
+		// wait for the last char to get out
+	write_uart_reg(port, UART_THR, c);
 	return 0;
 }
 
+
 int uart_getc(int port, bool wait)  /* returns -1 if no data available */
 {
 	if (wait) {
-		while (!(read_uart_reg(port, UART_LSR) & (1<<0))) // wait for data to show up in the rx fifo
-			;
+		while (!(read_uart_reg(port, UART_LSR) & (1<<0)));
+			// wait for data to show up in the rx fifo
 	} else {
 		if (!(read_uart_reg(port, UART_LSR) & (1<<0)))
 			return -1;
@@ -158,12 +171,14 @@ int uart_getc(int port, bool wait)  /* returns -1 if no data available */
 	return read_uart_reg(port, UART_RHR);
 }
 
+
 void uart_flush_tx(int port)
 {
-	while (!(read_uart_reg(port, UART_LSR) & (1<<6))) // wait for the last char to get out
-		;
+	while (!(read_uart_reg(port, UART_LSR) & (1<<6)));
+		// wait for the last char to get out
 }
 
+
 void uart_flush_rx(int port)
 {
 	// empty the rx fifo
@@ -172,5 +187,3 @@ void uart_flush_rx(int port)
 		(void)c;
 	}
 }
-
-