IB/core: Fix build failure without hugepages
PATCH 1/1 IB/core: Fix build failure without hugepages
HPAGE_SHIFT is only defined on architectures that support hugepages:
drivers/infiniband/core/umem_odp.c: In function 'ib_umem_odp_get':drivers/infiniband/core/umem_odp.c:245:26: error: 'HPAGE_SHIFT' undeclared (first use in this function); did you mean 'PAGE_SHIFT'?
Enclose this in an #ifdef.
Fixes 9ff1b6466a29 ("IB/core: Fix ODP with IB_ACCESS_HUGETLB handling")
Signed-off-by Arnd Bergmann <[email protected]>
--- drivers/infiniband/core/umem_odp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/core/umem_odp.c +3 -2
@@ -241,10 +241,11 @@ struct ib_umem_odp *ib_umem_odp_get(struct ib_udata *udata, unsigned long addr, umem_odp->umem.owning_mm = mm = current->mm; umem_odp->notifier.ops = ops; + umem_odp->page_shift =PAGE_SHIFT ; +#ifdef CONFIG_HUGETLB_PAGE if (access &IB_ACCESS_HUGETLB ) umem_odp->page_shift =HPAGE_SHIFT ; -else - umem_odp->page_shift =PAGE_SHIFT ; +#endif umem_odp->tgid =get_task_pid (current->group_leader,PIDTYPE_PID ); ret =ib_init_umem_odp (umem_odp, ops);
Signature · 1 line
2.20.0
Jason Gunthorpe
AppliedQuoted 5 lines · Arnd Bergmann
HPAGE_SHIFTis only defined on architectures that support hugepages:
drivers/infiniband/core/umem_odp.c: In function 'ib_umem_odp_get':drivers/infiniband/core/umem_odp.c:245:26: error: 'HPAGE_SHIFT' undeclared (first use in this function); did you mean 'PAGE_SHIFT'?
Quoted 7 lines
Enclose this in an #ifdef.
Fixes 9ff1b6466a29 ("IB/core: Fix ODP with IB_ACCESS_HUGETLB handling")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/infiniband/core/umem_odp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Applied to for-next, thanks
Jason