diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /arch/powerpc/kernel/vdso.c | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/powerpc/kernel/vdso.c')
| -rw-r--r-- | arch/powerpc/kernel/vdso.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index b316fda58b89..ec8370368423 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
| @@ -180,8 +180,8 @@ static struct page * vdso_vma_nopage(struct vm_area_struct * vma, | |||
| 180 | unsigned long offset = address - vma->vm_start; | 180 | unsigned long offset = address - vma->vm_start; |
| 181 | struct page *pg; | 181 | struct page *pg; |
| 182 | #ifdef CONFIG_PPC64 | 182 | #ifdef CONFIG_PPC64 |
| 183 | void *vbase = test_thread_flag(TIF_32BIT) ? | 183 | void *vbase = (vma->vm_mm->task_size > TASK_SIZE_USER32) ? |
| 184 | vdso32_kbase : vdso64_kbase; | 184 | vdso64_kbase : vdso32_kbase; |
| 185 | #else | 185 | #else |
| 186 | void *vbase = vdso32_kbase; | 186 | void *vbase = vdso32_kbase; |
| 187 | #endif | 187 | #endif |