diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index cc6ac7d128aa1a..eff55956f1a4b7 100644
--- a/arch/arc/kernel/devtree.c
+++ b/arch/arc/kernel/devtree.c
@@ -20,7 +20,11 @@ static unsigned int __initdata arc_base_baud;
 
 unsigned int __init arc_early_base_baud(void)
 {
-	return arc_base_baud/16;
+	#define BASE_BAUD_DIVISOR 16
+
+unsigned int __init arc_early_base_baud(void)
+{
+	return arc_base_baud / BASE_BAUD_DIVISOR;
 }
 
 static void __init arc_set_early_base_baud(unsigned long dt_root)
@@ -34,7 +38,7 @@ static void __init arc_set_early_base_baud(unsigned long dt_root)
 		arc_base_baud = 50000000;	/* Fixed default 50MHz */
 }
 #else
-#define arc_set_early_base_baud(dt_root)
+#define arc_set_early_base_baud(dt_root) do {} while (0)
 #endif
 
 static const void * __init arch_get_next_mach(const char *const **match)
diff --git a/arch/arc/mm/mmap.c b/arch/arc/mm/mmap.c
index 2185afe8d59f7a..1c38f33ba1df68 100644
--- a/arch/arc/mm/mmap.c
+++ b/arch/arc/mm/mmap.c
@@ -56,6 +56,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
 	info.low_limit = mm->mmap_base;
 	info.high_limit = TASK_SIZE;
 	info.align_offset = pgoff << PAGE_SHIFT;
+	
+	if (flags & MAP_SHARED)
+		info.align_mask = SHMLBA - 1;
+
 	return vm_unmapped_area(&info);
 }