diff for duplicates of <20140825231449.GS17254@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 4270443..01847d1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -83,7 +83,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> + cxt->cached); if (IS_ERR(cxt->przs[i])) { err = PTR_ERR(cxt->przs[i]); - dev_err(dev, "failed to request mem region (0x%zx@0x%llx): %d\n", + dev_err(dev, "failed to request mem region (0x%zx at 0x%llx): %d\n", @@ -388,7 +395,7 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt, return -ENOMEM; } @@ -136,7 +136,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> + void *va; + if (!request_mem_region(start, size, "persistent_ram")) { - pr_err("request mem region (0x%llx@0x%llx) failed\n", + pr_err("request mem region (0x%llx at 0x%llx) failed\n", (unsigned long long)size, (unsigned long long)start); @@ -422,19 +429,24 @@ static void *persistent_ram_iomap(phys_addr_t start, size_t size) buffer_start_add = buffer_start_add_locked; diff --git a/a/content_digest b/N1/content_digest index 3b7d67d..175228e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,7 @@ - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH] pstore/ram_core: Fix hang on ARMs because of pgprot_noncached\0" "Date\0Mon, 25 Aug 2014 16:14:50 -0700\0" - "To\0Anton Vorontsov <anton@enomsg.org>" - Colin Cross <ccross@android.com> - Kees Cook <keescook@chromium.org> - " Tony Luck <tony.luck@intel.com>\0" - "Cc\0Randy Dunlap <rdunlap@infradead.org>" - Rob Herring <robherring2@gmail.com> - Russell King <linux@arm.linux.org.uk> - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-omap@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Currently trying to use pstore on ARMs can hang as we're mapping the\n" @@ -98,7 +89,7 @@ "+\t\t\t\t\t\t cxt->cached);\n" " \t\tif (IS_ERR(cxt->przs[i])) {\n" " \t\t\terr = PTR_ERR(cxt->przs[i]);\n" - " \t\t\tdev_err(dev, \"failed to request mem region (0x%zx@0x%llx): %d\\n\",\n" + " \t\t\tdev_err(dev, \"failed to request mem region (0x%zx at 0x%llx): %d\\n\",\n" "@@ -388,7 +395,7 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,\n" " \t\treturn -ENOMEM;\n" " \t}\n" @@ -151,7 +142,7 @@ "+\tvoid *va;\n" "+\n" " \tif (!request_mem_region(start, size, \"persistent_ram\")) {\n" - " \t\tpr_err(\"request mem region (0x%llx@0x%llx) failed\\n\",\n" + " \t\tpr_err(\"request mem region (0x%llx at 0x%llx) failed\\n\",\n" " \t\t\t(unsigned long long)size, (unsigned long long)start);\n" "@@ -422,19 +429,24 @@ static void *persistent_ram_iomap(phys_addr_t start, size_t size)\n" " \tbuffer_start_add = buffer_start_add_locked;\n" @@ -222,4 +213,4 @@ " \tunsigned long\tconsole_size;\n" " \tunsigned long\tftrace_size;" -731f5322e3af6a8f48657618c9cdbf3ba09f8ded6d5654414ddb93439481c2f9 +9e956cff31270cf19a6e5292e10b9d4e2595cdfcf6b51d16b79cd3d2407f20d9
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.