This is a note to let you know that I've just added the patch titled
ARM: fix type of PHYS_PFN_OFFSET to unsigned long
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-fix-type-of-phys_pfn_offset-to-unsigned-long.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5b20c5b2f014ecc0a6310988af69cd7ede9e7c67 Mon Sep 17 00:00:00 2001
From: Cyril Chemparathy <cyril@xxxxxx>
Date: Wed, 12 Sep 2012 10:19:05 -0400
Subject: ARM: fix type of PHYS_PFN_OFFSET to unsigned long
From: Cyril Chemparathy <cyril@xxxxxx>
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@xxxxxx>
Acked-by: Nicolas Pitre <nico@xxxxxxxxxx>
Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Tested-by: Subash Patel <subash.rp@xxxxxxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
Cc: Hou Pengyang <houpengyang@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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.
Patches currently in stable-queue which might be from cyril@xxxxxx are
queue-3.10/arm-fix-type-of-phys_pfn_offset-to-unsigned-long.patch
queue-3.10/arm-lpae-use-signed-arithmetic-for-mask-definitions.patch
queue-3.10/arm-lpae-use-phys_addr_t-in-alloc_init_pud.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html