Skip to content

Commit

Permalink
mm: remove blackfin MPU support
Browse files Browse the repository at this point in the history
The CONFIG_MPU option was only defined on blackfin, and that architecture
is now being removed, so the respective code can be simplified.

A lot of other microcontrollers have an MPU, but I suspect that if we
want to bring that support back, we'd do it differently anyway.

Signed-off-by: Arnd Bergmann <[email protected]>
  • Loading branch information
arndb committed Mar 16, 2018
1 parent e05a959 commit 1a84291
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 24 deletions.
4 changes: 0 additions & 4 deletions kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -2181,10 +2181,6 @@ static void free_module(struct module *mod)
/* Finally, free the core (containing the module structure) */
disable_ro_nx(&mod->core_layout);
module_memfree(mod->core_layout.base);

#ifdef CONFIG_MPU
update_protections(current->mm);
#endif
}

void *__symbol_get(const char *symbol)
Expand Down
20 changes: 0 additions & 20 deletions mm/nommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -662,22 +662,6 @@ static void put_nommu_region(struct vm_region *region)
__put_nommu_region(region);
}

/*
* update protection on a vma
*/
static void protect_vma(struct vm_area_struct *vma, unsigned long flags)
{
#ifdef CONFIG_MPU
struct mm_struct *mm = vma->vm_mm;
long start = vma->vm_start & PAGE_MASK;
while (start < vma->vm_end) {
protect_page(mm, start, flags);
start += PAGE_SIZE;
}
update_protections(mm);
#endif
}

/*
* add a VMA into a process's mm_struct in the appropriate place in the list
* and tree and add to the address space's page tree also if not an anonymous
Expand All @@ -695,8 +679,6 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
mm->map_count++;
vma->vm_mm = mm;

protect_vma(vma, vma->vm_flags);

/* add the VMA to the mapping */
if (vma->vm_file) {
mapping = vma->vm_file->f_mapping;
Expand Down Expand Up @@ -757,8 +739,6 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
struct mm_struct *mm = vma->vm_mm;
struct task_struct *curr = current;

protect_vma(vma, 0);

mm->map_count--;
for (i = 0; i < VMACACHE_SIZE; i++) {
/* if the vma is cached, invalidate the entire cache */
Expand Down

0 comments on commit 1a84291

Please sign in to comment.