diff for duplicates of <20140916205000.GA6672@atomide.com> diff --git a/a/1.txt b/N1/1.txt index b7680b0..c14f579 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -139,7 +139,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> + cxt->memtype); 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; } @@ -200,7 +200,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 a6a0fda..eadd39c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,10 @@ "ref\01410546745-919-1-git-send-email-tony@atomide.com\0" "ref\01410546745-919-2-git-send-email-tony@atomide.com\0" "ref\020140912231514.GB12379@n2100.arm.linux.org.uk\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 2/2] pstore-ram: Allow optional mapping with pgprot_noncached\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 2/2] pstore-ram: Allow optional mapping with pgprot_noncached\0" "Date\0Tue, 16 Sep 2014 13:50:01 -0700\0" - "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>\0" - "Cc\0Andrew Morton <akpm@linux-foundation.org>" - linux-kernel@vger.kernel.org - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - Arnd Bergmann <arnd@arndb.de> - Rob Herring <robherring2@gmail.com> - Randy Dunlap <rdunlap@infradead.org> - Anton Vorontsov <anton@enomsg.org> - Colin Cross <ccross@android.com> - Kees Cook <keescook@chromium.org> - Olof Johansson <olof@lixom.net> - " Tony Luck <tony.luck@intel.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Russell King - ARM Linux <linux@arm.linux.org.uk> [140912 16:16]:\n" @@ -160,7 +148,7 @@ "+\t\t\t\t\t\t cxt->memtype);\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" @@ -221,7 +209,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" @@ -292,4 +280,4 @@ " \tunsigned long\tconsole_size;\n" " \tunsigned long\tftrace_size;" -a3699fd825a5db973bea730b64451ff522dcc41567573484fabd1a75e7c29f8f +710d05ea0c47eba769c2cee140c651d8bb27033daf2986b1081ddc4a3e0afed1
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.