Commit 824282ca authored Apr 22, 2013 by Linus Torvalds

upstream-linus

Pull MIPS fix from Ralf Baechle:
 "Revert the change of the definition of PAGE_MASK which was prettier
  but broke a few relativly rare platforms"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  Revert "MIPS: page.h: Provide more readable definition for PAGE_MASK."

parents f83b2933 3b5e50ed

arch/mips/include/asm/page.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		#define PAGE_SHIFT 16
		#endif
		#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
		#define PAGE_MASK (~(PAGE_SIZE - 1))
		#define PAGE_MASK (~((1 << PAGE_SHIFT) - 1))

		#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
		#define HPAGE_SHIFT (PAGE_SHIFT + PAGE_SHIFT - 3)