diff for duplicates of <20090812081906.5757.39417.sendpatchset@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 4f36a32..71be332 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,8 @@ Cc: Andi Kleen <andi@firstfloor.org> --- 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,9 @@ extern size_t vmcoreinfo_max_size; @@ -27,7 +28,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 @@ -1083,6 +1083,76 @@ void crash_kexec(struct pt_regs *regs) } @@ -70,7 +72,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; + } @@ -107,7 +109,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 75174b1..da64423 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020090812081731.5757.25254.sendpatchset@localhost.localdomain\0" "From\0Amerigo Wang <amwang@redhat.com>\0" "Subject\0[Patch 8/8] kexec: allow to shrink reserved memory\0" - "Date\0Wed, 12 Aug 2009 08:16:44 +0000\0" + "Date\0Wed, 12 Aug 2009 04:16:44 -0400\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0tony.luck@intel.com" linux-ia64@vger.kernel.org @@ -32,7 +32,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,9 @@ extern size_t vmcoreinfo_max_size;\n" " \n" @@ -45,7 +46,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" "@@ -1083,6 +1083,76 @@ void crash_kexec(struct pt_regs *regs)\n" " \t}\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" @@ -125,7 +127,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" @@ -163,4 +166,4 @@ " #endif\n" " \tNULL" -2166db425c145f3d7a0025ae7907f0eb3ce655d3d305f0c968ccae098537f2d2 +38271105b045d3d2b3736a6686cd4eb262e43a019d8596a73e7566bd53f29ecf
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.