| Message ID | 1414420206-7869-1-git-send-email-clg@fr.ibm.com (mailing list archive) |
|---|---|
| State | Rejected, archived |
| Headers | show |
On Mon, 2014-27-10 at 14:30:06 UTC, =?utf-8?q?C=C3=A9dric_Le_Goater?= wrote: > CC arch/powerpc/mm/slice.o > In file included from ../arch/powerpc/mm/slice.c:33:0: > ../include/linux/hugetlb.h:141:47: error: expected identifier or ‘(’ before numeric constant > #define is_hugepage_only_range(mm, addr, len) 0 > ^ > ../arch/powerpc/mm/slice.c:704:5: note: in expansion of macro ‘is_hugepage_only_range’ > int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, > ^ Hi Cedric, I'm pretty sure this is fixed in my fixes branch: https://git.kernel.org/cgit/linux/kernel/git/mpe/linux.git/log/?h=fixes cheers
Hello Michael, On 10/28/2014 05:31 AM, Michael Ellerman wrote: > On Mon, 2014-27-10 at 14:30:06 UTC, =?utf-8?q?C=C3=A9dric_Le_Goater?= wrote: >> CC arch/powerpc/mm/slice.o >> In file included from ../arch/powerpc/mm/slice.c:33:0: >> ../include/linux/hugetlb.h:141:47: error: expected identifier or ‘(’ before numeric constant >> #define is_hugepage_only_range(mm, addr, len) 0 >> ^ >> ../arch/powerpc/mm/slice.c:704:5: note: in expansion of macro ‘is_hugepage_only_range’ >> int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, >> ^ > > Hi Cedric, > > I'm pretty sure this is fixed in my fixes branch: > > https://git.kernel.org/cgit/linux/kernel/git/mpe/linux.git/log/?h=fixes Indeed. I just picked -rc2 without checking your branch. I will next time. Thanks, C.
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c index 8d7bda94d196..89bc01222649 100644 --- a/arch/powerpc/mm/slice.c +++ b/arch/powerpc/mm/slice.c @@ -682,6 +682,7 @@ void slice_set_range_psize(struct mm_struct *mm, unsigned long start, slice_convert(mm, mask, psize); } +#ifdef CONFIG_HUGETLB_PAGE /* * is_hugepage_only_range() is used by generic code to verify whether * a normal mmap mapping (non hugetlbfs) is valid on a given area. @@ -727,3 +728,4 @@ int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, return !slice_check_fit(mask, available); } +#endif
CC arch/powerpc/mm/slice.o In file included from ../arch/powerpc/mm/slice.c:33:0: ../include/linux/hugetlb.h:141:47: error: expected identifier or ‘(’ before numeric constant #define is_hugepage_only_range(mm, addr, len) 0 ^ ../arch/powerpc/mm/slice.c:704:5: note: in expansion of macro ‘is_hugepage_only_range’ int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, ^ Signed-off-by: Cédric Le Goater <clg@fr.ibm.com> --- arch/powerpc/mm/slice.c | 2 ++ 1 file changed, 2 insertions(+)