diff for duplicates of <4D9993AD.3080401@ti.com> diff --git a/a/1.txt b/N1/1.txt index 258f8e7..b31fae1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -97,3 +97,8 @@ index a3f50b3..6af3d0b 100644 -- 1.6.0.4 + +-------------- next part -------------- +An embedded and charset-unspecified text was scrubbed... +Name: 0001-OMAP-SRAM-Fix-warning-format-08lx-expects-type.patch +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110404/9ccf311e/attachment.ksh> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index cee0a08..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: text/plain; - name="0001-OMAP-SRAM-Fix-warning-format-08lx-expects-type.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename*0="0001-OMAP-SRAM-Fix-warning-format-08lx-expects-type.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 8e0baf7..0000000 --- a/a/2.txt +++ /dev/null @@ -1,58 +0,0 @@ ->From 4d8d4e5c99c1477a8cb04b525ff5a2d93bbdacfd Mon Sep 17 00:00:00 2001 -From: Santosh Shilimkar <santosh.shilimkar@ti.com> -Date: Mon, 4 Apr 2011 14:20:08 +0530 -Subject: [PATCH] OMAP: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int' - -Fix below build warning. - - CC arch/arm/plat-omap/sram.o - arch/arm/plat-omap/sram.c: In function 'omap_map_sram': - arch/arm/plat-omap/sram.c:224: warning: format '%08lx' expects - type 'long unsigned int', but argument 2 has type 'unsigned int' - -While at this, convert SRAM printk(* "") to pr_*(""). - -Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> ---- - arch/arm/plat-omap/sram.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c -index a3f50b3..6af3d0b 100644 ---- a/arch/arm/plat-omap/sram.c -+++ b/arch/arm/plat-omap/sram.c -@@ -166,7 +166,7 @@ static void __init omap_detect_sram(void) - else if (cpu_is_omap1611()) - omap_sram_size = SZ_256K; - else { -- printk(KERN_ERR "Could not detect SRAM size\n"); -+ pr_err("Could not detect SRAM size\n"); - omap_sram_size = 0x4000; - } - } -@@ -221,10 +221,10 @@ static void __init omap_map_sram(void) - omap_sram_io_desc[0].length = ROUND_DOWN(omap_sram_size, PAGE_SIZE); - iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc)); - -- printk(KERN_INFO "SRAM: Mapped pa 0x%08lx to va 0x%08lx size: 0x%lx\n", -- __pfn_to_phys(omap_sram_io_desc[0].pfn), -- omap_sram_io_desc[0].virtual, -- omap_sram_io_desc[0].length); -+ pr_info("SRAM: Mapped pa 0x%08llx to va 0x%08lx size: 0x%lx\n", -+ (long long) __pfn_to_phys(omap_sram_io_desc[0].pfn), -+ omap_sram_io_desc[0].virtual, -+ omap_sram_io_desc[0].length); - - /* - * Normally devicemaps_init() would flush caches and tlb after -@@ -252,7 +252,7 @@ static void __init omap_map_sram(void) - void *omap_sram_push_address(unsigned long size) - { - if (size > (omap_sram_ceil - (omap_sram_base + SRAM_BOOTLOADER_SZ))) { -- printk(KERN_ERR "Not enough space in SRAM\n"); -+ pr_err("Not enough space in SRAM\n"); - return NULL; - } - --- -1.6.0.4 diff --git a/a/content_digest b/N1/content_digest index b60ea39..c5125b1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,10 @@ "ref\01301907896-30954-1-git-send-email-santosh.shilimkar@ti.com\0" "ref\020110404091223.GA19854@n2100.arm.linux.org.uk\0" - "From\0Santosh Shilimkar <santosh.shilimkar@ti.com>\0" - "Subject\0Re: [PATCH] OMAP4: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int'\0" + "From\0santosh.shilimkar@ti.com (Santosh Shilimkar)\0" + "Subject\0[PATCH] OMAP4: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int'\0" "Date\0Mon, 04 Apr 2011 15:17:25 +0530\0" - "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>\0" - "Cc\0linux-omap@vger.kernel.org" - " linux-arm-kernel@lists.infradead.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "On 4/4/2011 2:42 PM, Russell King - ARM Linux wrote:\n" "> On Mon, Apr 04, 2011 at 02:34:56PM +0530, Santosh Shilimkar wrote:\n" @@ -106,67 +104,11 @@ " \t}\n" "\n" "-- \n" - 1.6.0.4 - "\01:2\0" - "fn\00001-OMAP-SRAM-Fix-warning-format-08lx-expects-type.patch\0" - "b\0" - ">From 4d8d4e5c99c1477a8cb04b525ff5a2d93bbdacfd Mon Sep 17 00:00:00 2001\n" - "From: Santosh Shilimkar <santosh.shilimkar@ti.com>\n" - "Date: Mon, 4 Apr 2011 14:20:08 +0530\n" - "Subject: [PATCH] OMAP: SRAM: Fix warning: format '%08lx' expects type 'long unsigned int'\n" - "\n" - "Fix below build warning.\n" - "\n" - " CC\tarch/arm/plat-omap/sram.o\n" - "\tarch/arm/plat-omap/sram.c: In function 'omap_map_sram':\n" - "\tarch/arm/plat-omap/sram.c:224: warning: format '%08lx' expects\n" - "\ttype 'long unsigned int', but argument 2 has type 'unsigned int'\n" + "1.6.0.4\n" "\n" - "While at this, convert SRAM printk(* \"\") to pr_*(\"\").\n" - "\n" - "Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>\n" - "---\n" - " arch/arm/plat-omap/sram.c | 12 ++++++------\n" - " 1 files changed, 6 insertions(+), 6 deletions(-)\n" - "\n" - "diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c\n" - "index a3f50b3..6af3d0b 100644\n" - "--- a/arch/arm/plat-omap/sram.c\n" - "+++ b/arch/arm/plat-omap/sram.c\n" - "@@ -166,7 +166,7 @@ static void __init omap_detect_sram(void)\n" - " \t\telse if (cpu_is_omap1611())\n" - " \t\t\tomap_sram_size = SZ_256K;\n" - " \t\telse {\n" - "-\t\t\tprintk(KERN_ERR \"Could not detect SRAM size\\n\");\n" - "+\t\t\tpr_err(\"Could not detect SRAM size\\n\");\n" - " \t\t\tomap_sram_size = 0x4000;\n" - " \t\t}\n" - " \t}\n" - "@@ -221,10 +221,10 @@ static void __init omap_map_sram(void)\n" - " \tomap_sram_io_desc[0].length = ROUND_DOWN(omap_sram_size, PAGE_SIZE);\n" - " \tiotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc));\n" - " \n" - "-\tprintk(KERN_INFO \"SRAM: Mapped pa 0x%08lx to va 0x%08lx size: 0x%lx\\n\",\n" - "-\t__pfn_to_phys(omap_sram_io_desc[0].pfn),\n" - "-\tomap_sram_io_desc[0].virtual,\n" - "-\t omap_sram_io_desc[0].length);\n" - "+\tpr_info(\"SRAM: Mapped pa 0x%08llx to va 0x%08lx size: 0x%lx\\n\",\n" - "+\t\t(long long) __pfn_to_phys(omap_sram_io_desc[0].pfn),\n" - "+\t\tomap_sram_io_desc[0].virtual,\n" - "+\t\tomap_sram_io_desc[0].length);\n" - " \n" - " \t/*\n" - " \t * Normally devicemaps_init() would flush caches and tlb after\n" - "@@ -252,7 +252,7 @@ static void __init omap_map_sram(void)\n" - " void *omap_sram_push_address(unsigned long size)\n" - " {\n" - " \tif (size > (omap_sram_ceil - (omap_sram_base + SRAM_BOOTLOADER_SZ))) {\n" - "-\t\tprintk(KERN_ERR \"Not enough space in SRAM\\n\");\n" - "+\t\tpr_err(\"Not enough space in SRAM\\n\");\n" - " \t\treturn NULL;\n" - " \t}\n" - " \n" - "-- \n" - 1.6.0.4 + "-------------- next part --------------\n" + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: 0001-OMAP-SRAM-Fix-warning-format-08lx-expects-type.patch\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110404/9ccf311e/attachment.ksh> -0c549bb82c80ff464429772f77c242804fa4f11694d36b316871a80747f97ae7 +5683ae6e01f2f815a2f2414325b818d1f218c8376d55c2237c069e57878cee2b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.