diff for duplicates of <20090904101112.5220.16543.sendpatchset@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 8981a79..d22a9a6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ Cc: Ingo Molnar <mingo@elte.hu> --- 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> @@ -65,7 +66,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]; @@ -101,7 +102,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 @@ @@ -112,7 +114,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,16 @@ +#ifndef _ASM_GENERIC_KEXEC_H diff --git a/a/content_digest b/N1/content_digest index 6af1caf..411bc56 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020090904101047.5220.20618.sendpatchset@localhost.localdomain\0" "From\0Amerigo Wang <amwang@redhat.com>\0" "Subject\0[Patch 2/8] x86: implement crashkernel=auto\0" - "Date\0Fri, 04 Sep 2009 10:08:45 +0000\0" + "Date\0Fri, 4 Sep 2009 06:08:45 -0400\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0tony.luck@intel.com" linux-ia64@vger.kernel.org @@ -33,7 +33,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" @@ -86,7 +87,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" @@ -122,7 +123,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" @@ -133,7 +135,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,16 @@\n" "+#ifndef _ASM_GENERIC_KEXEC_H\n" @@ -153,4 +156,4 @@ "+\n" +#endif -ca04f86a7037245cee7b684750323655bf1bde6fd6f46e8fd215248b8e690ae4 +35bb604c75489c6e4a53ddbfe3d8ef78a36636971c6e3ecfd1194943d2117f22
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.