Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87c62a66 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

MIPS: Fix HPAGE_SIZE redefinition 



This patch fixes warnings like this:
  CC      fs/proc/meminfo.o
In file included from /work/linux/include/linux/mmzone.h:20,
                 from /work/linux/include/linux/gfp.h:4,
                 from /work/linux/include/linux/mm.h:8,
                 from /work/linux/fs/proc/meminfo.c:5:
/work/linux/arch/mips/include/asm/page.h:36:1: warning: "HPAGE_SIZE" redefined
In file included from /work/linux/fs/proc/meminfo.c:2:
/work/linux/include/linux/hugetlb.h:107:1: warning: this is the location of the previous definition

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent a33a052f

arch/mips/include/asm/page.h

+2 −0
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ 
#define PAGE_SIZE	(1UL << PAGE_SHIFT)

#define PAGE_MASK       (~((1 << PAGE_SHIFT) - 1))



#ifdef CONFIG_HUGETLB_PAGE

#define HPAGE_SHIFT	(PAGE_SHIFT + PAGE_SHIFT - 3)

#define HPAGE_SIZE	((1UL) << HPAGE_SHIFT)

#define HPAGE_MASK	(~(HPAGE_SIZE - 1))

#define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)

#endif /* CONFIG_HUGETLB_PAGE */



#ifndef __ASSEMBLY__