xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/e1000e/ich8lan.c
This commit is contained in:
David S. Miller
2008-12-15 20:03:50 -08:00
parent 9a4a84294b a3dd15444b
commit eb14f01959
197 changed files with 3874 additions and 2665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/sgi-gru/grufault.c
View File

@@ -254,7 +254,11 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,
return 1;
*paddr = pte_pfn(pte) << PAGE_SHIFT;
#ifdef CONFIG_HUGETLB_PAGE
*pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT;
#else
*pageshift = PAGE_SHIFT;
#endif
return 0;
err: