Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756492AbcCBAtw (ORCPT ); Tue, 1 Mar 2016 19:49:52 -0500 Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:56744 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755991AbcCAX4k (ORCPT ); Tue, 1 Mar 2016 18:56:40 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=mandrill; d=linuxfoundation.org; b=cvL1AiN6ksiEXF5CA7WvjtSrLm83W0YPLy5vFbajoFCcXtzUkREtSrd1qzFGIj4/JroSdpWPWGJN rAECmT0BuREbvNcGBqdwK9JI/Cj5qVBpI2r+8VFPjaVgeYamAPoa+tBMdTr3yXek6uiwlVDd5JVJ KXapB9IYVPA7HbL17x8=; From: Greg Kroah-Hartman Subject: [PATCH 4.4 154/342] Revert "MIPS: Fix PAGE_MASK definition" X-Mailer: git-send-email 2.7.2 To: Cc: Greg Kroah-Hartman , , Manuel Lauss , Dan Williams , Linux-MIPS , Ralf Baechle Message-Id: <20160301234532.951366305@linuxfoundation.org> In-Reply-To: <20160301234527.990448862@linuxfoundation.org> References: <20160301234527.990448862@linuxfoundation.org> X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.6ba411b099aa42faa08e6d56130d5fc1 X-Mandrill-User: md_30481620 Date: Tue, 01 Mar 2016 23:54:35 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1197 Lines: 37 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Williams commit 800dc4f49cc002879e1e5e6b79926f86b60528e6 upstream. 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 Signed-off-by: Dan Williams Cc: linux-kernel@vger.kernel.org Cc: Linux-MIPS Patchwork: https://patchwork.linux-mips.org/patch/12182/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- arch/mips/include/asm/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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