diff for duplicates of <20090821065650.4855.53279.sendpatchset@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 5be2015..a4b26f4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,8 @@ Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> --- Index: linux-2.6/include/linux/kexec.h -=================================--- linux-2.6.orig/include/linux/kexec.h +=================================================================== +--- linux-2.6.orig/include/linux/kexec.h +++ linux-2.6/include/linux/kexec.h @@ -206,6 +206,8 @@ extern size_t vmcoreinfo_max_size; @@ -29,7 +30,8 @@ Index: linux-2.6/include/linux/kexec.h #else /* !CONFIG_KEXEC */ struct pt_regs; Index: linux-2.6/kernel/kexec.c -=================================--- linux-2.6.orig/kernel/kexec.c +=================================================================== +--- linux-2.6.orig/kernel/kexec.c +++ linux-2.6/kernel/kexec.c @@ -31,6 +31,7 @@ #include <linux/cpu.h> @@ -69,7 +71,7 @@ Index: linux-2.6/kernel/kexec.c + + if (new_size >= end - start + 1) { + ret = -EINVAL; -+ if (new_size = end - start + 1) ++ if (new_size == end - start + 1) + ret = 0; + goto unlock; + } @@ -84,7 +86,7 @@ Index: linux-2.6/kernel/kexec.c + totalram_pages++; + } + -+ if (start = end) { ++ if (start == end) { + crashk_res.end = end; + release_resource(&crashk_res); + } else @@ -99,7 +101,8 @@ Index: linux-2.6/kernel/kexec.c size_t data_len) { Index: linux-2.6/kernel/ksysfs.c -=================================--- linux-2.6.orig/kernel/ksysfs.c +=================================================================== +--- linux-2.6.orig/kernel/ksysfs.c +++ linux-2.6/kernel/ksysfs.c @@ -100,6 +100,26 @@ static ssize_t kexec_crash_loaded_show(s } diff --git a/a/content_digest b/N1/content_digest index dffe5ad..b9ad386 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020090821065637.4855.32234.sendpatchset@localhost.localdomain\0" "From\0Amerigo Wang <amwang@redhat.com>\0" "Subject\0[Patch 1/8] kexec: allow to shrink reserved memory\0" - "Date\0Fri, 21 Aug 2009 06:54:25 +0000\0" + "Date\0Fri, 21 Aug 2009 02:54:25 -0400\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0tony.luck@intel.com" linux-ia64@vger.kernel.org @@ -36,7 +36,8 @@ "---\n" "\n" "Index: linux-2.6/include/linux/kexec.h\n" - "=================================--- linux-2.6.orig/include/linux/kexec.h\n" + "===================================================================\n" + "--- linux-2.6.orig/include/linux/kexec.h\n" "+++ linux-2.6/include/linux/kexec.h\n" "@@ -206,6 +206,8 @@ extern size_t vmcoreinfo_max_size;\n" " \n" @@ -48,7 +49,8 @@ " #else /* !CONFIG_KEXEC */\n" " struct pt_regs;\n" "Index: linux-2.6/kernel/kexec.c\n" - "=================================--- linux-2.6.orig/kernel/kexec.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/kexec.c\n" "+++ linux-2.6/kernel/kexec.c\n" "@@ -31,6 +31,7 @@\n" " #include <linux/cpu.h>\n" @@ -88,7 +90,7 @@ "+\n" "+\tif (new_size >= end - start + 1) {\n" "+\t\tret = -EINVAL;\n" - "+\t\tif (new_size = end - start + 1)\n" + "+\t\tif (new_size == end - start + 1)\n" "+\t\t\tret = 0;\n" "+\t\tgoto unlock;\n" "+\t}\n" @@ -103,7 +105,7 @@ "+\t\ttotalram_pages++;\n" "+\t}\n" "+\n" - "+\tif (start = end) {\n" + "+\tif (start == end) {\n" "+\t\tcrashk_res.end = end;\n" "+\t\trelease_resource(&crashk_res);\n" "+\t} else\n" @@ -118,7 +120,8 @@ " \t\t\t size_t data_len)\n" " {\n" "Index: linux-2.6/kernel/ksysfs.c\n" - "=================================--- linux-2.6.orig/kernel/ksysfs.c\n" + "===================================================================\n" + "--- linux-2.6.orig/kernel/ksysfs.c\n" "+++ linux-2.6/kernel/ksysfs.c\n" "@@ -100,6 +100,26 @@ static ssize_t kexec_crash_loaded_show(s\n" " }\n" @@ -156,4 +159,4 @@ " #endif\n" " \tNULL" -1be7c942fa3108a53e9b04c6f3376fd8b822c8d3446aa8514c1c9b46b51460d2 +5e4f3d346264011b8327bd86b1ac3344f27dab827822e362b9698acbfcfad0c3
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.