diff for duplicates of <20090904101133.5220.82773.sendpatchset@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 7e30409..bb62f60 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,8 @@ Cc: Tony Luck <tony.luck@intel.com> --- Index: linux-2.6/arch/ia64/include/asm/kexec.h -=================================--- linux-2.6.orig/arch/ia64/include/asm/kexec.h +=================================================================== +--- linux-2.6.orig/arch/ia64/include/asm/kexec.h +++ linux-2.6/arch/ia64/include/asm/kexec.h @@ -1,6 +1,7 @@ #ifndef _ASM_IA64_KEXEC_H @@ -33,7 +34,8 @@ Index: linux-2.6/arch/ia64/include/asm/kexec.h extern const unsigned int relocate_new_kernel_size; extern void relocate_new_kernel(unsigned long, unsigned long, Index: linux-2.6/arch/ia64/kernel/machine_kexec.c -=================================--- linux-2.6.orig/arch/ia64/kernel/machine_kexec.c +=================================================================== +--- linux-2.6.orig/arch/ia64/kernel/machine_kexec.c +++ linux-2.6/arch/ia64/kernel/machine_kexec.c @@ -147,6 +147,44 @@ void arch_crash_save_vmcoreinfo(void) #endif @@ -44,7 +46,8 @@ Index: linux-2.6/arch/ia64/kernel/machine_kexec.c +#define GBYTES(n) ((n)*1024*1024*1024ULL) +/* + Memory size Reserved memory -+ ====== =======+ [4G, 12G) 256M ++ =========== =============== ++ [4G, 12G) 256M + [12G, 128G) 512M + [128G, 256G) 768M + [256G, 378G) 1024M diff --git a/a/content_digest b/N1/content_digest index 038cd7e..e6a83d7 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 4/8] ia64: implement crashkernel=auto\0" - "Date\0Fri, 04 Sep 2009 10:09:05 +0000\0" + "Date\0Fri, 4 Sep 2009 06:09:05 -0400\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Anton Vorontsov <avorontsov@ru.mvista.com>" tony.luck@intel.com @@ -30,7 +30,8 @@ "---\n" "\n" "Index: linux-2.6/arch/ia64/include/asm/kexec.h\n" - "=================================--- linux-2.6.orig/arch/ia64/include/asm/kexec.h\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/include/asm/kexec.h\n" "+++ linux-2.6/arch/ia64/include/asm/kexec.h\n" "@@ -1,6 +1,7 @@\n" " #ifndef _ASM_IA64_KEXEC_H\n" @@ -54,7 +55,8 @@ " extern const unsigned int relocate_new_kernel_size;\n" " extern void relocate_new_kernel(unsigned long, unsigned long,\n" "Index: linux-2.6/arch/ia64/kernel/machine_kexec.c\n" - "=================================--- linux-2.6.orig/arch/ia64/kernel/machine_kexec.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/kernel/machine_kexec.c\n" "+++ linux-2.6/arch/ia64/kernel/machine_kexec.c\n" "@@ -147,6 +147,44 @@ void arch_crash_save_vmcoreinfo(void)\n" " #endif\n" @@ -65,7 +67,8 @@ "+#define GBYTES(n) ((n)*1024*1024*1024ULL)\n" "+/*\n" "+ Memory size Reserved memory\n" - "+ ====== =======+ [4G, 12G) 256M\n" + "+ =========== ===============\n" + "+ [4G, 12G) 256M\n" "+ [12G, 128G) 512M\n" "+ [128G, 256G) 768M\n" "+ [256G, 378G) 1024M\n" @@ -101,4 +104,4 @@ " {\n" " \treturn ia64_tpa((unsigned long)(char *)&vmcoreinfo_note);" -c01fee8686ab267caf3e09d5bd6a22ba0dc616165ab8ab0ca71c2eb8a5213a1b +087e56eb7d1aa94a238a496b4f5484448aa72d9cb891d5e4ea68df56a6d921fe
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.