Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

#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__