Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions arch/arc/kernel/devtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions arch/arc/mm/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down