diff for duplicates of <20070909190835.GB10600@suse.de> diff --git a/a/1.txt b/N1/1.txt index 26477c4..2b0665d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -184,8 +184,3 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de> extern int find_max_min_low_pfn (unsigned long , unsigned long, void *); 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 d845652..8bcb697 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,10 +5,10 @@ "Subject\0Re: [patch 4/5] Use extended crashkernel command line on IA64\0" "Date\0Sun, 9 Sep 2007 21:08:36 +0200\0" "To\0Matthew Wilcox <matthew@wil.cx>\0" - "Cc\0linux-arch@vger.kernel.org" - linux-ia64@vger.kernel.org - kexec@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "Cc\0kexec@lists.infradead.org" + linux-kernel@vger.kernel.org + linux-arch@vger.kernel.org + " linux-ia64@vger.kernel.org\0" "\00:1\0" "b\0" "* Matthew Wilcox <matthew@wil.cx> [2007-09-09 15:01]:\n" @@ -196,11 +196,6 @@ "+extern unsigned long efi_memmap_init(unsigned long *s, unsigned long *e);\n" " extern int find_max_min_low_pfn (unsigned long , unsigned long, void *);\n" " \n" - " extern unsigned long vmcore_find_descriptor_size(unsigned long address);\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + extern unsigned long vmcore_find_descriptor_size(unsigned long address); -87d157fb679a59ca30a32e365ee912e1606b2cc6f3a8bb39486e78280af88e0e +c0354f42f3eb83987ba08b80244b519bf20ebe04dcfb1dcd10c898a26863eabc
diff --git a/a/1.txt b/N2/1.txt index 26477c4..4ccd68f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -75,7 +75,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, @@ -87,10 +87,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; @@ -139,7 +137,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; @@ -150,10 +148,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; @@ -184,8 +180,3 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de> extern int find_max_min_low_pfn (unsigned long , unsigned long, void *); 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 d845652..141022d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,12 +3,12 @@ "ref\020070909130139.GF6809@parisc-linux.org\0" "From\0Bernhard Walle <bwalle@suse.de>\0" "Subject\0Re: [patch 4/5] Use extended crashkernel command line on IA64\0" - "Date\0Sun, 9 Sep 2007 21:08:36 +0200\0" + "Date\0Sun, 09 Sep 2007 19:08:36 +0000\0" "To\0Matthew Wilcox <matthew@wil.cx>\0" - "Cc\0linux-arch@vger.kernel.org" - linux-ia64@vger.kernel.org - kexec@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "Cc\0kexec@lists.infradead.org" + linux-kernel@vger.kernel.org + linux-arch@vger.kernel.org + " linux-ia64@vger.kernel.org\0" "\00:1\0" "b\0" "* Matthew Wilcox <matthew@wil.cx> [2007-09-09 15:01]:\n" @@ -88,7 +88,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" @@ -100,10 +100,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" @@ -152,7 +150,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" @@ -163,10 +161,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" @@ -196,11 +192,6 @@ "+extern unsigned long efi_memmap_init(unsigned long *s, unsigned long *e);\n" " extern int find_max_min_low_pfn (unsigned long , unsigned long, void *);\n" " \n" - " extern unsigned long vmcore_find_descriptor_size(unsigned long address);\n" - "\n" - "_______________________________________________\n" - "kexec mailing list\n" - "kexec@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/kexec + extern unsigned long vmcore_find_descriptor_size(unsigned long address); -87d157fb679a59ca30a32e365ee912e1606b2cc6f3a8bb39486e78280af88e0e +aff738c9ed809c1a632dfd20bfd45651dc60803cbdbc10318386eb08c9bf9a23
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.