diff for duplicates of <4D0AD464.2020408@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 968a9fa..3f30ce8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ Signed-off-by: Yinghai Lu <yinghai@kernel.org> 3 files changed, 3 insertions(+), 2 deletions(-) Index: linux-2.6/arch/x86/include/asm/apicdef.h -=================================--- linux-2.6.orig/arch/x86/include/asm/apicdef.h +=================================================================== +--- linux-2.6.orig/arch/x86/include/asm/apicdef.h +++ linux-2.6/arch/x86/include/asm/apicdef.h @@ -145,6 +145,7 @@ @@ -23,7 +24,8 @@ Index: linux-2.6/arch/x86/include/asm/apicdef.h # define MAX_IO_APICS 128 # define MAX_LOCAL_APIC 32768 Index: linux-2.6/arch/x86/kernel/apic/apic.c -=================================--- linux-2.6.orig/arch/x86/kernel/apic/apic.c +=================================================================== +--- linux-2.6.orig/arch/x86/kernel/apic/apic.c +++ linux-2.6/arch/x86/kernel/apic/apic.c @@ -1689,7 +1689,7 @@ void __init register_lapic_address(unsig * This initializes the IO-APIC and APIC hardware if this is @@ -35,7 +37,8 @@ Index: linux-2.6/arch/x86/kernel/apic/apic.c int __init APIC_init_uniprocessor(void) { Index: linux-2.6/arch/x86/include/asm/mpspec.h -=================================--- linux-2.6.orig/arch/x86/include/asm/mpspec.h +=================================================================== +--- linux-2.6.orig/arch/x86/include/asm/mpspec.h +++ linux-2.6/arch/x86/include/asm/mpspec.h @@ -6,7 +6,7 @@ #include <asm/mpspec_def.h> diff --git a/a/content_digest b/N1/content_digest index fe0be57..0623d3e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,7 +15,7 @@ "ref\04D094703.7080701@zytor.com\0" "From\0Yinghai Lu <yinghai@kernel.org>\0" "Subject\0[PATCH 1/2] x86, acpi: add MAX_LOCAL_APIC for 32bit\0" - "Date\0Fri, 17 Dec 2010 03:09:24 +0000\0" + "Date\0Thu, 16 Dec 2010 19:09:24 -0800\0" "To\0H. Peter Anvin <hpa@zytor.com>\0" "Cc\0Ingo Molnar <mingo@elte.hu>" Andrew Morton <akpm@linux-foundation.org> @@ -49,7 +49,8 @@ " 3 files changed, 3 insertions(+), 2 deletions(-)\n" "\n" "Index: linux-2.6/arch/x86/include/asm/apicdef.h\n" - "=================================--- linux-2.6.orig/arch/x86/include/asm/apicdef.h\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/include/asm/apicdef.h\n" "+++ linux-2.6/arch/x86/include/asm/apicdef.h\n" "@@ -145,6 +145,7 @@\n" " \n" @@ -60,7 +61,8 @@ " # define MAX_IO_APICS 128\n" " # define MAX_LOCAL_APIC 32768\n" "Index: linux-2.6/arch/x86/kernel/apic/apic.c\n" - "=================================--- linux-2.6.orig/arch/x86/kernel/apic/apic.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/kernel/apic/apic.c\n" "+++ linux-2.6/arch/x86/kernel/apic/apic.c\n" "@@ -1689,7 +1689,7 @@ void __init register_lapic_address(unsig\n" " * This initializes the IO-APIC and APIC hardware if this is\n" @@ -72,7 +74,8 @@ " int __init APIC_init_uniprocessor(void)\n" " {\n" "Index: linux-2.6/arch/x86/include/asm/mpspec.h\n" - "=================================--- linux-2.6.orig/arch/x86/include/asm/mpspec.h\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/include/asm/mpspec.h\n" "+++ linux-2.6/arch/x86/include/asm/mpspec.h\n" "@@ -6,7 +6,7 @@\n" " #include <asm/mpspec_def.h>\n" @@ -84,4 +87,4 @@ " \n" #ifdef CONFIG_X86_32 -f2993133bc0b9c4de0adf8b371dd453101d816e5dbf956d705dd38d4e6e1fced +718c17c3ce9df8ac49f24077b85cc8dec7e47abdf68fd43410f77d889ccfe7f2
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.