From: Ralf Baechle Date: Mon, 22 Apr 2013 15:57:54 +0000 (+0200) Subject: Revert "MIPS: page.h: Provide more readable definition for PAGE_MASK." X-Git-Tag: upstream/snapshot3+hdmi~5313^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b5e50edaf500f392f4a372296afc0b99ffa7e70;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Revert "MIPS: page.h: Provide more readable definition for PAGE_MASK." This reverts commit c17a6554782ad531f4713b33fd6339ba67ef6391. Manuel Lauss writes: lmo commit c17a6554 (MIPS: page.h: Provide more readable definition for PAGE_MASK) apparently breaks ioremap of 36-bit addresses on my Alchemy systems (PCI and PCMCIA) The reason is that in arch/mips/mm/ioremap.c line 157 (phys_addr &= PAGE_MASK) bits 32-35 are cut off. Seems the new PAGE_MASK is explicitly 32bit, or one could make it signed instead of unsigned long. --- diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h index 99fc547..eab99e5 100644 --- a/arch/mips/include/asm/page.h +++ b/arch/mips/include/asm/page.h @@ -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)