[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20150203231725.269429637@linuxfoundation.org>
Date: Tue, 3 Feb 2015 15:17:04 -0800
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Cyril Chemparathy <cyril@...com>,
Nicolas Pitre <nico@...aro.org>,
Santosh Shilimkar <santosh.shilimkar@...com>,
Subash Patel <subash.rp@...sung.com>,
Will Deacon <will.deacon@....com>,
Hou Pengyang <houpengyang@...wei.com>
Subject: [PATCH 3.10 22/51] ARM: fix type of PHYS_PFN_OFFSET to unsigned long
3.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cyril Chemparathy <cyril@...com>
commit 5b20c5b2f014ecc0a6310988af69cd7ede9e7c67 upstream.
On LPAE machines, PHYS_OFFSET evaluates to a phys_addr_t and this type is
inherited by the PHYS_PFN_OFFSET definition as well. Consequently, the kernel
build emits warnings of the form:
init/main.c: In function 'start_kernel':
init/main.c:588:7: warning: format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'phys_addr_t' [-Wformat]
This patch fixes this warning by pinning down the PFN type to unsigned long.
Signed-off-by: Cyril Chemparathy <cyril@...com>
Acked-by: Nicolas Pitre <nico@...aro.org>
Tested-by: Santosh Shilimkar <santosh.shilimkar@...com>
Tested-by: Subash Patel <subash.rp@...sung.com>
Signed-off-by: Will Deacon <will.deacon@....com>
Cc: Hou Pengyang <houpengyang@...wei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
arch/arm/include/asm/memory.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -207,7 +207,7 @@ static inline unsigned long __phys_to_vi
* direct-mapped view. We assume this is the first page
* of RAM in the mem_map as well.
*/
-#define PHYS_PFN_OFFSET (PHYS_OFFSET >> PAGE_SHIFT)
+#define PHYS_PFN_OFFSET ((unsigned long)(PHYS_OFFSET >> PAGE_SHIFT))
/*
* These are *only* valid on the kernel direct mapped RAM memory.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists