Skip to content

Commit

Permalink
mm: arch: rename in_gate_area_no_task to in_gate_area_no_mm
Browse files Browse the repository at this point in the history
Now that gate vma's are referenced with respect to a particular mm and not a
particular task it only makes sense to propagate the change to this predicate as
well.

Signed-off-by: Stephen Wilson <wilsons@start.ca>
Reviewed-by: Michel Lespinasse <walken@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Stephen Wilson authored and Al Viro committed Mar 23, 2011
1 parent 83b964b commit cae5d39
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/vdso.c
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ static int __init vdso_init(void)
}
arch_initcall(vdso_init);

int in_gate_area_no_task(unsigned long addr)
int in_gate_area_no_mm(unsigned long addr)
{
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/s390/kernel/vdso.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ static int __init vdso_init(void)
}
arch_initcall(vdso_init);

int in_gate_area_no_task(unsigned long addr)
int in_gate_area_no_mm(unsigned long addr)
{
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/kernel/vsyscall/vsyscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ int in_gate_area(struct mm_struct *mm, unsigned long address)
return 0;
}

int in_gate_area_no_task(unsigned long address)
int in_gate_area_no_mm(unsigned long address)
{
return 0;
}
8 changes: 4 additions & 4 deletions arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -881,11 +881,11 @@ int in_gate_area(struct mm_struct *mm, unsigned long addr)
}

/*
* Use this when you have no reliable task/vma, typically from interrupt
* context. It is less reliable than using the task's vma and may give
* false positives:
* Use this when you have no reliable mm, typically from interrupt
* context. It is less reliable than using a task's mm and may give
* false positives.
*/
int in_gate_area_no_task(unsigned long addr)
int in_gate_area_no_mm(unsigned long addr)
{
return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
}
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/vdso/vdso32-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ int in_gate_area(struct mm_struct *mm, unsigned long addr)
return vma && addr >= vma->vm_start && addr < vma->vm_end;
}

int in_gate_area_no_task(unsigned long addr)
int in_gate_area_no_mm(unsigned long addr)
{
return 0;
}
Expand Down
6 changes: 3 additions & 3 deletions include/linux/mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -1580,11 +1580,11 @@ static inline bool kernel_page_present(struct page *page) { return true; }

extern struct vm_area_struct *get_gate_vma(struct mm_struct *mm);
#ifdef __HAVE_ARCH_GATE_AREA
int in_gate_area_no_task(unsigned long addr);
int in_gate_area_no_mm(unsigned long addr);
int in_gate_area(struct mm_struct *mm, unsigned long addr);
#else
int in_gate_area_no_task(unsigned long addr);
#define in_gate_area(mm, addr) ({(void)mm; in_gate_area_no_task(addr);})
int in_gate_area_no_mm(unsigned long addr);
#define in_gate_area(mm, addr) ({(void)mm; in_gate_area_no_mm(addr);})
#endif /* __HAVE_ARCH_GATE_AREA */

int drop_caches_sysctl_handler(struct ctl_table *, int,
Expand Down
4 changes: 2 additions & 2 deletions kernel/kallsyms.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ static inline int is_kernel_text(unsigned long addr)
if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
arch_is_kernel_text(addr))
return 1;
return in_gate_area_no_task(addr);
return in_gate_area_no_mm(addr);
}

static inline int is_kernel(unsigned long addr)
{
if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
return 1;
return in_gate_area_no_task(addr);
return in_gate_area_no_mm(addr);
}

static int is_ksym_addr(unsigned long addr)
Expand Down
2 changes: 1 addition & 1 deletion mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -3505,7 +3505,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
#endif
}

int in_gate_area_no_task(unsigned long addr)
int in_gate_area_no_mm(unsigned long addr)
{
#ifdef AT_SYSINFO_EHDR
if ((addr >= FIXADDR_USER_START) && (addr < FIXADDR_USER_END))
Expand Down
2 changes: 1 addition & 1 deletion mm/nommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1963,7 +1963,7 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)
return -ENOMEM;
}

int in_gate_area_no_task(unsigned long addr)
int in_gate_area_no_mm(unsigned long addr)
{
return 0;
}
Expand Down

0 comments on commit cae5d39

Please sign in to comment.