lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ../linux-2.6

Browse Source
This commit is contained in:
Paul Mackerras
2006-03-09 14:32:05 +11:00
parent 6749c55073 0d514f040a
commit 5164501794
270 changed files with 3169 additions and 2217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/vdso.c
View File

@@ -180,8 +180,8 @@ static struct page * vdso_vma_nopage(struct vm_area_struct * vma,
unsigned long offset = address - vma->vm_start;
struct page *pg;
#ifdef CONFIG_PPC64
void *vbase = test_thread_flag(TIF_32BIT) ?
vdso32_kbase : vdso64_kbase;
void *vbase = (vma->vm_mm->task_size > TASK_SIZE_USER32) ?
vdso64_kbase : vdso32_kbase;
#else
void *vbase = vdso32_kbase;
#endif