diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-01-22 09:20:37 -0800 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-01-23 00:28:57 +0100 |
| commit | 800dc4f49cc002879e1e5e6b79926f86b60528e6 (patch) | |
| tree | 26e6ec247906b422644540069aba6b8c216e259f | |
| parent | 8083013fc3201b75535afc39338cc7d2cad32e37 (diff) | |
| download | linux-800dc4f49cc002879e1e5e6b79926f86b60528e6.tar.gz linux-800dc4f49cc002879e1e5e6b79926f86b60528e6.tar.bz2 linux-800dc4f49cc002879e1e5e6b79926f86b60528e6.zip | |
Revert "MIPS: Fix PAGE_MASK definition"
This reverts commit 22b14523994588279ae9c5ccfe64073c1e5b3c00.
It was originally sent in an earlier revision of the pfn_t patchset.
Besides being broken, the warning is also fixed by PFN_FLAGS_MASK
casting the PAGE_MASK to an unsigned long.
Reported-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Cc: linux-kernel@vger.kernel.org
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Cc: stable@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12182/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h index 2046c0230224..21ed7150fec3 100644 --- a/arch/mips/include/asm/page.h +++ b/arch/mips/include/asm/page.h @@ -33,7 +33,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)) /* * This is used for calculating the real page sizes |