projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-for-kalle-2016-04-12_2' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
powerpc
/
include
/
asm
/
hugetlb.h
diff --git
a/arch/powerpc/include/asm/hugetlb.h
b/arch/powerpc/include/asm/hugetlb.h
index
7eac89b
..
42814f0
100644
(file)
--- a/
arch/powerpc/include/asm/hugetlb.h
+++ b/
arch/powerpc/include/asm/hugetlb.h
@@
-19,7
+19,7
@@
static inline pte_t *hugepd_page(hugepd_t hpd)
* We have only four bits to encode, MMU page size
*/
BUILD_BUG_ON((MMU_PAGE_COUNT - 1) > 0xf);
- return
(pte_t *)(hpd.pd & ~HUGEPD_SHIFT
_MASK);
+ return
__va(hpd.pd & HUGEPD_ADDR
_MASK);
}
static inline unsigned int hugepd_mmu_psize(hugepd_t hpd)