diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-03 16:03:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-03 16:03:51 -0800 |
| commit | 87b049b5ebcd509ec656492c469846809c61f67e (patch) | |
| tree | f60d65f8d30c6892eeec54baa3a95d2d3010dac8 /mm | |
| parent | 5c4ac43f344a226ed1a60ef8b7482cbdb09c1c9f (diff) | |
| parent | 3a28b9c6f955aa5ba04c4c634e8ce9e8d1a2b019 (diff) | |
| download | history-87b049b5ebcd509ec656492c469846809c61f67e.tar.gz | |
Merge bk://linux-sam.bkbits.net/kbuild
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/memory.c b/mm/memory.c index 18f93120cf3edf..3cf660bcb5a4e9 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2092,7 +2092,7 @@ unsigned long vmalloc_to_pfn(void * vmalloc_addr) EXPORT_SYMBOL(vmalloc_to_pfn); -#if !defined(CONFIG_ARCH_GATE_AREA) +#if !defined(__HAVE_ARCH_GATE_AREA) #if defined(AT_SYSINFO_EHDR) struct vm_area_struct gate_vma; @@ -2118,7 +2118,7 @@ struct vm_area_struct *get_gate_vma(struct task_struct *tsk) #endif } -int in_gate_area(struct task_struct *task, unsigned long addr) +int in_gate_area_no_task(unsigned long addr) { #ifdef AT_SYSINFO_EHDR if ((addr >= FIXADDR_USER_START) && (addr < FIXADDR_USER_END)) @@ -2127,4 +2127,4 @@ int in_gate_area(struct task_struct *task, unsigned long addr) return 0; } -#endif +#endif /* __HAVE_ARCH_GATE_AREA */ |