mm: arch: rename in_gate_area_no_task to in_gate_area_no_mm
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>
This commit is contained in:
Родитель
83b964bbf8
Коммит
cae5d39032
|
@ -820,7 +820,7 @@ static int __init vdso_init(void)
|
||||||
}
|
}
|
||||||
arch_initcall(vdso_init);
|
arch_initcall(vdso_init);
|
||||||
|
|
||||||
int in_gate_area_no_task(unsigned long addr)
|
int in_gate_area_no_mm(unsigned long addr)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -337,7 +337,7 @@ static int __init vdso_init(void)
|
||||||
}
|
}
|
||||||
arch_initcall(vdso_init);
|
arch_initcall(vdso_init);
|
||||||
|
|
||||||
int in_gate_area_no_task(unsigned long addr)
|
int in_gate_area_no_mm(unsigned long addr)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -104,7 +104,7 @@ int in_gate_area(struct mm_struct *mm, unsigned long address)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int in_gate_area_no_task(unsigned long address)
|
int in_gate_area_no_mm(unsigned long address)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
* Use this when you have no reliable mm, typically from interrupt
|
||||||
* context. It is less reliable than using the task's vma and may give
|
* context. It is less reliable than using a task's mm and may give
|
||||||
* false positives:
|
* 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);
|
return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
extern struct vm_area_struct *get_gate_vma(struct mm_struct *mm);
|
||||||
#ifdef __HAVE_ARCH_GATE_AREA
|
#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);
|
int in_gate_area(struct mm_struct *mm, unsigned long addr);
|
||||||
#else
|
#else
|
||||||
int in_gate_area_no_task(unsigned long addr);
|
int in_gate_area_no_mm(unsigned long addr);
|
||||||
#define in_gate_area(mm, addr) ({(void)mm; in_gate_area_no_task(addr);})
|
#define in_gate_area(mm, addr) ({(void)mm; in_gate_area_no_mm(addr);})
|
||||||
#endif /* __HAVE_ARCH_GATE_AREA */
|
#endif /* __HAVE_ARCH_GATE_AREA */
|
||||||
|
|
||||||
int drop_caches_sysctl_handler(struct ctl_table *, int,
|
int drop_caches_sysctl_handler(struct ctl_table *, int,
|
||||||
|
|
|
@ -64,14 +64,14 @@ static inline int is_kernel_text(unsigned long addr)
|
||||||
if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
|
if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
|
||||||
arch_is_kernel_text(addr))
|
arch_is_kernel_text(addr))
|
||||||
return 1;
|
return 1;
|
||||||
return in_gate_area_no_task(addr);
|
return in_gate_area_no_mm(addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int is_kernel(unsigned long addr)
|
static inline int is_kernel(unsigned long addr)
|
||||||
{
|
{
|
||||||
if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
|
if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
|
||||||
return 1;
|
return 1;
|
||||||
return in_gate_area_no_task(addr);
|
return in_gate_area_no_mm(addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int is_ksym_addr(unsigned long addr)
|
static int is_ksym_addr(unsigned long addr)
|
||||||
|
|
|
@ -3505,7 +3505,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
int in_gate_area_no_task(unsigned long addr)
|
int in_gate_area_no_mm(unsigned long addr)
|
||||||
{
|
{
|
||||||
#ifdef AT_SYSINFO_EHDR
|
#ifdef AT_SYSINFO_EHDR
|
||||||
if ((addr >= FIXADDR_USER_START) && (addr < FIXADDR_USER_END))
|
if ((addr >= FIXADDR_USER_START) && (addr < FIXADDR_USER_END))
|
||||||
|
|
|
@ -1963,7 +1963,7 @@ error:
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
int in_gate_area_no_task(unsigned long addr)
|
int in_gate_area_no_mm(unsigned long addr)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче