diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-15 22:38:58 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-15 22:38:58 -0500 |
| commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
| tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /drivers/misc | |
| parent | 91cac623262c1c0cd298c5c648a8bd2b647c264d (diff) | |
| parent | 23e0e8afafd9ac065d81506524adf3339584044b (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/sgi-gru/grufault.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index 8c389d606c30..3ee698ad8599 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c | |||
| @@ -254,7 +254,11 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr, | |||
| 254 | return 1; | 254 | return 1; |
| 255 | 255 | ||
| 256 | *paddr = pte_pfn(pte) << PAGE_SHIFT; | 256 | *paddr = pte_pfn(pte) << PAGE_SHIFT; |
| 257 | #ifdef CONFIG_HUGETLB_PAGE | ||
| 257 | *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT; | 258 | *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT; |
| 259 | #else | ||
| 260 | *pageshift = PAGE_SHIFT; | ||
| 261 | #endif | ||
| 258 | return 0; | 262 | return 0; |
| 259 | 263 | ||
| 260 | err: | 264 | err: |