diff for duplicates of <20070920171846.695412000@stravinsky.suse.de> diff --git a/a/1.txt b/N1/1.txt index c623f15..855d486 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -162,9 +162,4 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de> extern unsigned long vmcore_find_descriptor_size(unsigned long address); --- - -_______________________________________________ -kexec mailing list -kexec@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/kexec +-- diff --git a/a/content_digest b/N1/content_digest index 66d5b74..47c9eb4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,9 +4,9 @@ "Date\0Thu, 20 Sep 2007 19:18:49 +0200\0" "To\0kexec@lists.infradead.org" " akpm@linux-foundation.org\0" - "Cc\0linux-arch@vger.kernel.org" - linux-ia64@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + "Cc\0linux-kernel@vger.kernel.org" + linux-arch@vger.kernel.org + " linux-ia64@vger.kernel.org\0" "\00:1\0" "fn\0crashkernel-ia64\0" "b\0" @@ -174,11 +174,6 @@ " \n" " extern unsigned long vmcore_find_descriptor_size(unsigned long address);\n" "\n" - "-- \n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + -- -25c5062ccb3cc810235a57cdd6a8feda823107951f33a170646a7dc59c7c089a +3a4fddfefcfe21e317d71aa03a1bd73594cc88ed6e47f3a30d7246700db548a1
diff --git a/a/1.txt b/N2/1.txt index c623f15..6fb6aee 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -52,7 +52,7 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de> + + ret = parse_crashkernel(boot_command_line, total, + &size, &base); -+ if (ret == 0 && size > 0) { ++ if (ret = 0 && size > 0) { + if (!base) { + sort_regions(rsvd_region, *n); + base = kdump_find_rsvd_region(size, @@ -64,10 +64,8 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de> + (unsigned long)(size >> 20), + (unsigned long)(base >> 20), + (unsigned long)(total >> 20)); -+ rsvd_region[*n].start = -+ (unsigned long)__va(base); -+ rsvd_region[*n].end = -+ (unsigned long)__va(base + size); ++ rsvd_region[*n].start + (unsigned long)__va(base); ++ rsvd_region[*n].end + (unsigned long)__va(base + size); + (*n)++; + crashk_res.start = base; + crashk_res.end = base + size - 1; @@ -116,7 +114,7 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de> - unsigned long base, size; - if (from) { - size = memparse(from + 12, &from); -- if (*from == '@') +- if (*from = '@') - base = memparse(from+1, &from); - else - base = 0; @@ -127,10 +125,8 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de> - rsvd_region, n); - } - if (base != ~0UL) { -- rsvd_region[n].start = -- (unsigned long)__va(base); -- rsvd_region[n].end = -- (unsigned long)__va(base + size); +- rsvd_region[n].start - (unsigned long)__va(base); +- rsvd_region[n].end - (unsigned long)__va(base + size); - n++; - crashk_res.start = base; - crashk_res.end = base + size - 1; @@ -162,9 +158,4 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de> extern unsigned long vmcore_find_descriptor_size(unsigned long address); --- - -_______________________________________________ -kexec mailing list -kexec@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/kexec +-- diff --git a/a/content_digest b/N2/content_digest index 66d5b74..559e573 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,13 @@ "ref\020070920171845.774383000@stravinsky.suse.de\0" "From\0Bernhard Walle <bwalle@suse.de>\0" "Subject\0[patch 4/7] Use extended crashkernel command line on ia64\0" - "Date\0Thu, 20 Sep 2007 19:18:49 +0200\0" + "Date\0Thu, 20 Sep 2007 17:18:49 +0000\0" "To\0kexec@lists.infradead.org" " akpm@linux-foundation.org\0" - "Cc\0linux-arch@vger.kernel.org" - linux-ia64@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + "Cc\0linux-kernel@vger.kernel.org" + linux-arch@vger.kernel.org + " linux-ia64@vger.kernel.org\0" "\00:1\0" - "fn\0crashkernel-ia64\0" "b\0" "This patch adapts IA64 to use the generic parse_crashkernel() function\n" "instead of its own parsing for the crashkernel command line.\n" @@ -64,7 +63,7 @@ "+\n" "+\tret = parse_crashkernel(boot_command_line, total,\n" "+\t\t\t&size, &base);\n" - "+\tif (ret == 0 && size > 0) {\n" + "+\tif (ret = 0 && size > 0) {\n" "+\t\tif (!base) {\n" "+\t\t\tsort_regions(rsvd_region, *n);\n" "+\t\t\tbase = kdump_find_rsvd_region(size,\n" @@ -76,10 +75,8 @@ "+\t\t\t\t\t(unsigned long)(size >> 20),\n" "+\t\t\t\t\t(unsigned long)(base >> 20),\n" "+\t\t\t\t\t(unsigned long)(total >> 20));\n" - "+\t\t\trsvd_region[*n].start =\n" - "+\t\t\t\t(unsigned long)__va(base);\n" - "+\t\t\trsvd_region[*n].end =\n" - "+\t\t\t\t(unsigned long)__va(base + size);\n" + "+\t\t\trsvd_region[*n].start +\t\t\t\t(unsigned long)__va(base);\n" + "+\t\t\trsvd_region[*n].end +\t\t\t\t(unsigned long)__va(base + size);\n" "+\t\t\t(*n)++;\n" "+\t\t\tcrashk_res.start = base;\n" "+\t\t\tcrashk_res.end = base + size - 1;\n" @@ -128,7 +125,7 @@ "-\t\tunsigned long base, size;\n" "-\t\tif (from) {\n" "-\t\t\tsize = memparse(from + 12, &from);\n" - "-\t\t\tif (*from == '@')\n" + "-\t\t\tif (*from = '@')\n" "-\t\t\t\tbase = memparse(from+1, &from);\n" "-\t\t\telse\n" "-\t\t\t\tbase = 0;\n" @@ -139,10 +136,8 @@ "-\t\t\t\t\t\t\t \trsvd_region, n);\n" "-\t\t\t\t\t}\n" "-\t\t\t\tif (base != ~0UL) {\n" - "-\t\t\t\t\trsvd_region[n].start =\n" - "-\t\t\t\t\t\t(unsigned long)__va(base);\n" - "-\t\t\t\t\trsvd_region[n].end =\n" - "-\t\t\t\t\t\t(unsigned long)__va(base + size);\n" + "-\t\t\t\t\trsvd_region[n].start -\t\t\t\t\t\t(unsigned long)__va(base);\n" + "-\t\t\t\t\trsvd_region[n].end -\t\t\t\t\t\t(unsigned long)__va(base + size);\n" "-\t\t\t\t\tn++;\n" "-\t\t\t\t\tcrashk_res.start = base;\n" "-\t\t\t\t\tcrashk_res.end = base + size - 1;\n" @@ -174,11 +169,6 @@ " \n" " extern unsigned long vmcore_find_descriptor_size(unsigned long address);\n" "\n" - "-- \n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + -- -25c5062ccb3cc810235a57cdd6a8feda823107951f33a170646a7dc59c7c089a +4f30011995fae16176c2caa9f27733447107be1864c088fb411c9746a46edd17
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.