Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 74ccd09526a0254c362adcc6c862354d724aa803

Authored by Jack Steiner
Committed by Linus Torvalds
1 parent 0cd2b0813a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

gru: add hugepage support 

Add support for hugepages. Easier than I originally thought.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 4 additions and 3 deletions Side-by-side Diff

drivers/misc/sgi-gru/grufault.c
Diff comments   View file @ 74ccd09
... ... @@ -192,10 +192,11 @@
192 192 {
193 193 struct page *page;
194 194  
195   - /* ZZZ Need to handle HUGE pages */
196   - if (is_vm_hugetlb_page(vma))
197   - return -EFAULT;
  195 +#ifdef CONFIG_HUGETLB_PAGE
  196 + *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT;
  197 +#else
198 198 *pageshift = PAGE_SHIFT;
  199 +#endif
199 200 if (get_user_pages
200 201 (current, current->mm, vaddr, 1, write, 0, &page, NULL) <= 0)
201 202 return -EFAULT;