diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /mm/memory.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 788a62810340..ae8161f1f459 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -2225,7 +2225,7 @@ void update_mem_hiwater(struct task_struct *tsk) | |||
| 2225 | #if !defined(__HAVE_ARCH_GATE_AREA) | 2225 | #if !defined(__HAVE_ARCH_GATE_AREA) |
| 2226 | 2226 | ||
| 2227 | #if defined(AT_SYSINFO_EHDR) | 2227 | #if defined(AT_SYSINFO_EHDR) |
| 2228 | struct vm_area_struct gate_vma; | 2228 | static struct vm_area_struct gate_vma; |
| 2229 | 2229 | ||
| 2230 | static int __init gate_vma_init(void) | 2230 | static int __init gate_vma_init(void) |
| 2231 | { | 2231 | { |