diff for duplicates of <20090812081755.5757.32765.sendpatchset@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 61d080b..8a25c21 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,8 @@ Signed-off-by: WANG Cong <amwang@redhat.com> --- 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 @@ -37,6 +37,7 @@ #include <asm/io.h> @@ -22,7 +23,7 @@ Index: linux-2.6/kernel/kexec.c ck_cmdline += 12; /* strlen("crashkernel=") */ +#ifdef CONFIG_KEXEC_AUTO_RESERVE -+ if (strncmp(ck_cmdline, "auto", 4) = 0) { ++ if (strncmp(ck_cmdline, "auto", 4) == 0) { + unsigned long long size; + int len; + char tmp[32]; @@ -58,7 +59,8 @@ Index: linux-2.6/kernel/kexec.c * if the commandline contains a ':', then that's the extended * syntax -- if not, it must be the classic syntax Index: linux-2.6/arch/x86/include/asm/kexec.h -=================================--- linux-2.6.orig/arch/x86/include/asm/kexec.h +=================================================================== +--- linux-2.6.orig/arch/x86/include/asm/kexec.h +++ linux-2.6/arch/x86/include/asm/kexec.h @@ -23,6 +23,7 @@ @@ -69,7 +71,8 @@ Index: linux-2.6/arch/x86/include/asm/kexec.h /* * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return. Index: linux-2.6/include/asm-generic/kexec.h -=================================--- /dev/null +=================================================================== +--- /dev/null +++ linux-2.6/include/asm-generic/kexec.h @@ -0,0 +1,42 @@ +#ifndef _ASM_GENERIC_KEXEC_H diff --git a/a/content_digest b/N1/content_digest index c524a27..46c774b 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 2/8] x86: implement crashkernel=auto\0" - "Date\0Wed, 12 Aug 2009 08:15:32 +0000\0" + "Date\0Wed, 12 Aug 2009 04:15:32 -0400\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0tony.luck@intel.com" linux-ia64@vger.kernel.org @@ -25,7 +25,8 @@ "---\n" "\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" "@@ -37,6 +37,7 @@\n" " #include <asm/io.h>\n" @@ -40,7 +41,7 @@ " \tck_cmdline += 12; /* strlen(\"crashkernel=\") */\n" " \n" "+#ifdef CONFIG_KEXEC_AUTO_RESERVE\n" - "+\tif (strncmp(ck_cmdline, \"auto\", 4) = 0) {\n" + "+\tif (strncmp(ck_cmdline, \"auto\", 4) == 0) {\n" "+\t\tunsigned long long size;\n" "+\t\tint len;\n" "+\t\tchar tmp[32];\n" @@ -76,7 +77,8 @@ " \t * if the commandline contains a ':', then that's the extended\n" " \t * syntax -- if not, it must be the classic syntax\n" "Index: linux-2.6/arch/x86/include/asm/kexec.h\n" - "=================================--- linux-2.6.orig/arch/x86/include/asm/kexec.h\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/include/asm/kexec.h\n" "+++ linux-2.6/arch/x86/include/asm/kexec.h\n" "@@ -23,6 +23,7 @@\n" " \n" @@ -87,7 +89,8 @@ " /*\n" " * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.\n" "Index: linux-2.6/include/asm-generic/kexec.h\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ linux-2.6/include/asm-generic/kexec.h\n" "@@ -0,0 +1,42 @@\n" "+#ifndef _ASM_GENERIC_KEXEC_H\n" @@ -133,4 +136,4 @@ "+\n" +#endif -c158b55e26e1604a754bee86dd41349d92cfcb31eb06e1682447de83cb467c15 +62c771e8c1ecd0f0e16e6806274f040be18fb463ee0144372b96628b77de511d
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.