diff for duplicates of <47A0BFE8.4020903@sgi.com> diff --git a/a/1.txt b/N1/1.txt index 4b2c58f..42e481b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,7 +76,8 @@ Mike > 18 files changed, 78 insertions(+), 125 deletions(-) > > Index: linux-x86.q/arch/ia64/Kconfig -> =================================> --- linux-x86.q.orig/arch/ia64/Kconfig +> =================================================================== +> --- linux-x86.q.orig/arch/ia64/Kconfig > +++ linux-x86.q/arch/ia64/Kconfig > @@ -80,7 +80,7 @@ config GENERIC_TIME_VSYSCALL > bool @@ -88,7 +89,8 @@ Mike > > config DMI > Index: linux-x86.q/arch/ia64/kernel/module.c -> =================================> --- linux-x86.q.orig/arch/ia64/kernel/module.c +> =================================================================== +> --- linux-x86.q.orig/arch/ia64/kernel/module.c > +++ linux-x86.q/arch/ia64/kernel/module.c > @@ -940,14 +940,3 @@ module_arch_cleanup (struct module *mod) > if (mod->arch.core_unw_table) @@ -106,7 +108,8 @@ Mike > -} > -#endif /* CONFIG_SMP */ > Index: linux-x86.q/arch/powerpc/Kconfig -> =================================> --- linux-x86.q.orig/arch/powerpc/Kconfig +> =================================================================== +> --- linux-x86.q.orig/arch/powerpc/Kconfig > +++ linux-x86.q/arch/powerpc/Kconfig > @@ -42,7 +42,7 @@ config GENERIC_HARDIRQS > bool @@ -118,7 +121,8 @@ Mike > > config IRQ_PER_CPU > Index: linux-x86.q/arch/sparc64/mm/init.c -> =================================> --- linux-x86.q.orig/arch/sparc64/mm/init.c +> =================================================================== +> --- linux-x86.q.orig/arch/sparc64/mm/init.c > +++ linux-x86.q/arch/sparc64/mm/init.c > @@ -1328,6 +1328,11 @@ pgd_t swapper_pg_dir[2048]; > static void sun4u_pgprot_init(void); @@ -133,7 +137,8 @@ Mike > { > unsigned long end_pfn, pages_avail, shift, phys_base; > Index: linux-x86.q/include/asm-alpha/topology.h -> =================================> --- linux-x86.q.orig/include/asm-alpha/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-alpha/topology.h > +++ linux-x86.q/include/asm-alpha/topology.h > @@ -6,6 +6,7 @@ > #include <asm/machvec.h> @@ -144,7 +149,8 @@ Mike > { > int node; > Index: linux-x86.q/include/asm-generic/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-generic/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-generic/percpu.h > +++ linux-x86.q/include/asm-generic/percpu.h > @@ -43,7 +43,12 @@ extern unsigned long __per_cpu_offset[NR > * Only S390 provides its own means of moving the pointer. @@ -161,7 +167,8 @@ Mike > > /* > Index: linux-x86.q/include/asm-generic/sections.h -> =================================> --- linux-x86.q.orig/include/asm-generic/sections.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-generic/sections.h > +++ linux-x86.q/include/asm-generic/sections.h > @@ -11,7 +11,17 @@ extern char _sinittext[], _einittext[]; > extern char _sextratext[] __attribute__((weak)); @@ -182,7 +189,8 @@ Mike > extern char __initdata_begin[], __initdata_end[]; > extern char __start_rodata[], __end_rodata[]; > Index: linux-x86.q/include/asm-generic/topology.h -> =================================> --- linux-x86.q.orig/include/asm-generic/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-generic/topology.h > +++ linux-x86.q/include/asm-generic/topology.h > @@ -32,6 +32,9 @@ > #ifndef cpu_to_node @@ -195,7 +203,8 @@ Mike > #define parent_node(node) (0) > #endif > Index: linux-x86.q/include/asm-generic/vmlinux.lds.h -> =================================> --- linux-x86.q.orig/include/asm-generic/vmlinux.lds.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-generic/vmlinux.lds.h > +++ linux-x86.q/include/asm-generic/vmlinux.lds.h > @@ -341,6 +341,20 @@ > *(.initcall7.init) \ @@ -224,7 +233,8 @@ Mike > __per_cpu_end = .; > +#endif > Index: linux-x86.q/include/asm-ia64/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-ia64/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-ia64/percpu.h > +++ linux-x86.q/include/asm-ia64/percpu.h > @@ -19,34 +19,14 @@ > # define PER_CPU_ATTRIBUTES __attribute__((__model__ (__small__))) @@ -277,7 +287,8 @@ Mike > #endif /* !__ASSEMBLY__ */ > > Index: linux-x86.q/include/asm-ia64/topology.h -> =================================> --- linux-x86.q.orig/include/asm-ia64/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-ia64/topology.h > +++ linux-x86.q/include/asm-ia64/topology.h > @@ -31,6 +31,7 @@ > * Returns the number of the node containing CPU 'cpu' @@ -288,7 +299,8 @@ Mike > /* > * Returns a bitmask of CPUs on Node 'node'. > Index: linux-x86.q/include/asm-mips/mach-ip27/topology.h -> =================================> --- linux-x86.q.orig/include/asm-mips/mach-ip27/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-mips/mach-ip27/topology.h > +++ linux-x86.q/include/asm-mips/mach-ip27/topology.h > @@ -23,6 +23,7 @@ struct cpuinfo_ip27 { > extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS]; @@ -299,7 +311,8 @@ Mike > #define node_to_cpumask(node) (hub_data(node)->h_cpus) > #define node_to_first_cpu(node) (first_cpu(node_to_cpumask(node))) > Index: linux-x86.q/include/asm-powerpc/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-powerpc/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-powerpc/percpu.h > +++ linux-x86.q/include/asm-powerpc/percpu.h > @@ -16,34 +16,9 @@ > #define __my_cpu_offset() get_paca()->data_offset @@ -339,7 +352,8 @@ Mike > > #endif /* _ASM_POWERPC_PERCPU_H_ */ > Index: linux-x86.q/include/asm-powerpc/topology.h -> =================================> --- linux-x86.q.orig/include/asm-powerpc/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-powerpc/topology.h > +++ linux-x86.q/include/asm-powerpc/topology.h > @@ -15,6 +15,7 @@ static inline int cpu_to_node(int cpu) > return numa_cpu_lookup_table[cpu]; @@ -350,7 +364,8 @@ Mike > > static inline cpumask_t node_to_cpumask(int node) > Index: linux-x86.q/include/asm-s390/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-s390/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-s390/percpu.h > +++ linux-x86.q/include/asm-s390/percpu.h > @@ -13,49 +13,25 @@ > */ @@ -412,7 +427,8 @@ Mike > > #endif /* __ARCH_S390_PERCPU__ */ > Index: linux-x86.q/include/asm-sparc64/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-sparc64/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-sparc64/percpu.h > +++ linux-x86.q/include/asm-sparc64/percpu.h > @@ -7,7 +7,6 @@ register unsigned long __local_per_cpu_o > @@ -456,7 +472,8 @@ Mike > > #endif /* __ARCH_SPARC64_PERCPU__ */ > Index: linux-x86.q/init/main.c -> =================================> --- linux-x86.q.orig/init/main.c +> =================================================================== +> --- linux-x86.q.orig/init/main.c > +++ linux-x86.q/init/main.c > @@ -374,18 +374,20 @@ EXPORT_SYMBOL(__per_cpu_offset); > @@ -488,7 +505,8 @@ Mike > } > #endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */ > Index: linux-x86.q/kernel/lockdep.c -> =================================> --- linux-x86.q.orig/kernel/lockdep.c +> =================================================================== +> --- linux-x86.q.orig/kernel/lockdep.c > +++ linux-x86.q/kernel/lockdep.c > @@ -609,8 +609,8 @@ static int static_obj(void *obj) > * percpu var? diff --git a/a/content_digest b/N1/content_digest index 226d150..cb91383 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,17 +6,17 @@ "ref\020080130180623.GA24881@elte.hu\0" "From\0Mike Travis <travis@sgi.com>\0" "Subject\0Re: x86/non-x86: percpu, node ids, apic ids x86.git fixup\0" - "Date\0Wed, 30 Jan 2008 18:20:24 +0000\0" + "Date\0Wed, 30 Jan 2008 10:20:24 -0800\0" "To\0Ingo Molnar <mingo@elte.hu>\0" - "Cc\0Luck" + "Cc\0sparclinux@vger.kernel.org" + Luck Tony <tony.luck@intel.com> - Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> - Linus Torvalds <torvalds@linux-foundation.org> - Thomas Gleixner <tglx@linutronix.de> + linux-ia64@vger.kernel.org Linux Kernel Development <linux-kernel@vger.kernel.org> Linux/PPC Development <linuxppc-dev@ozlabs.org> - linux-ia64@vger.kernel.org - " sparclinux@vger.kernel.org\0" + Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> + Thomas Gleixner <tglx@linutronix.de> + " Linus Torvalds <torvalds@linux-foundation.org>\0" "\00:1\0" "b\0" "Ingo Molnar wrote:\n" @@ -97,7 +97,8 @@ "> 18 files changed, 78 insertions(+), 125 deletions(-)\n" "> \n" "> Index: linux-x86.q/arch/ia64/Kconfig\n" - "> =================================> --- linux-x86.q.orig/arch/ia64/Kconfig\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/arch/ia64/Kconfig\n" "> +++ linux-x86.q/arch/ia64/Kconfig\n" "> @@ -80,7 +80,7 @@ config GENERIC_TIME_VSYSCALL\n" "> \tbool\n" @@ -109,7 +110,8 @@ "> \n" "> config DMI\n" "> Index: linux-x86.q/arch/ia64/kernel/module.c\n" - "> =================================> --- linux-x86.q.orig/arch/ia64/kernel/module.c\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/arch/ia64/kernel/module.c\n" "> +++ linux-x86.q/arch/ia64/kernel/module.c\n" "> @@ -940,14 +940,3 @@ module_arch_cleanup (struct module *mod)\n" "> \tif (mod->arch.core_unw_table)\n" @@ -127,7 +129,8 @@ "> -}\n" "> -#endif /* CONFIG_SMP */\n" "> Index: linux-x86.q/arch/powerpc/Kconfig\n" - "> =================================> --- linux-x86.q.orig/arch/powerpc/Kconfig\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/arch/powerpc/Kconfig\n" "> +++ linux-x86.q/arch/powerpc/Kconfig\n" "> @@ -42,7 +42,7 @@ config GENERIC_HARDIRQS\n" "> \tbool\n" @@ -139,7 +142,8 @@ "> \n" "> config IRQ_PER_CPU\n" "> Index: linux-x86.q/arch/sparc64/mm/init.c\n" - "> =================================> --- linux-x86.q.orig/arch/sparc64/mm/init.c\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/arch/sparc64/mm/init.c\n" "> +++ linux-x86.q/arch/sparc64/mm/init.c\n" "> @@ -1328,6 +1328,11 @@ pgd_t swapper_pg_dir[2048];\n" "> static void sun4u_pgprot_init(void);\n" @@ -154,7 +158,8 @@ "> {\n" "> \tunsigned long end_pfn, pages_avail, shift, phys_base;\n" "> Index: linux-x86.q/include/asm-alpha/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-alpha/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-alpha/topology.h\n" "> +++ linux-x86.q/include/asm-alpha/topology.h\n" "> @@ -6,6 +6,7 @@\n" "> #include <asm/machvec.h>\n" @@ -165,7 +170,8 @@ "> {\n" "> \tint node;\n" "> Index: linux-x86.q/include/asm-generic/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-generic/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-generic/percpu.h\n" "> +++ linux-x86.q/include/asm-generic/percpu.h\n" "> @@ -43,7 +43,12 @@ extern unsigned long __per_cpu_offset[NR\n" "> * Only S390 provides its own means of moving the pointer.\n" @@ -182,7 +188,8 @@ "> \n" "> /*\n" "> Index: linux-x86.q/include/asm-generic/sections.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-generic/sections.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-generic/sections.h\n" "> +++ linux-x86.q/include/asm-generic/sections.h\n" "> @@ -11,7 +11,17 @@ extern char _sinittext[], _einittext[];\n" "> extern char _sextratext[] __attribute__((weak));\n" @@ -203,7 +210,8 @@ "> extern char __initdata_begin[], __initdata_end[];\n" "> extern char __start_rodata[], __end_rodata[];\n" "> Index: linux-x86.q/include/asm-generic/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-generic/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-generic/topology.h\n" "> +++ linux-x86.q/include/asm-generic/topology.h\n" "> @@ -32,6 +32,9 @@\n" "> #ifndef cpu_to_node\n" @@ -216,7 +224,8 @@ "> #define parent_node(node)\t(0)\n" "> #endif\n" "> Index: linux-x86.q/include/asm-generic/vmlinux.lds.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-generic/vmlinux.lds.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-generic/vmlinux.lds.h\n" "> +++ linux-x86.q/include/asm-generic/vmlinux.lds.h\n" "> @@ -341,6 +341,20 @@\n" "> \t*(.initcall7.init)\t\t\t\t\t\t\\\n" @@ -245,7 +254,8 @@ "> \t__per_cpu_end = .;\n" "> +#endif\n" "> Index: linux-x86.q/include/asm-ia64/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-ia64/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-ia64/percpu.h\n" "> +++ linux-x86.q/include/asm-ia64/percpu.h\n" "> @@ -19,34 +19,14 @@\n" "> # define PER_CPU_ATTRIBUTES\t__attribute__((__model__ (__small__)))\n" @@ -298,7 +308,8 @@ "> #endif /* !__ASSEMBLY__ */\n" "> \n" "> Index: linux-x86.q/include/asm-ia64/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-ia64/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-ia64/topology.h\n" "> +++ linux-x86.q/include/asm-ia64/topology.h\n" "> @@ -31,6 +31,7 @@\n" "> * Returns the number of the node containing CPU 'cpu'\n" @@ -309,7 +320,8 @@ "> /*\n" "> * Returns a bitmask of CPUs on Node 'node'.\n" "> Index: linux-x86.q/include/asm-mips/mach-ip27/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-mips/mach-ip27/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-mips/mach-ip27/topology.h\n" "> +++ linux-x86.q/include/asm-mips/mach-ip27/topology.h\n" "> @@ -23,6 +23,7 @@ struct cpuinfo_ip27 {\n" "> extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];\n" @@ -320,7 +332,8 @@ "> #define node_to_cpumask(node)\t(hub_data(node)->h_cpus)\n" "> #define node_to_first_cpu(node)\t(first_cpu(node_to_cpumask(node)))\n" "> Index: linux-x86.q/include/asm-powerpc/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-powerpc/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-powerpc/percpu.h\n" "> +++ linux-x86.q/include/asm-powerpc/percpu.h\n" "> @@ -16,34 +16,9 @@\n" "> #define __my_cpu_offset() get_paca()->data_offset\n" @@ -360,7 +373,8 @@ "> \n" "> #endif /* _ASM_POWERPC_PERCPU_H_ */\n" "> Index: linux-x86.q/include/asm-powerpc/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-powerpc/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-powerpc/topology.h\n" "> +++ linux-x86.q/include/asm-powerpc/topology.h\n" "> @@ -15,6 +15,7 @@ static inline int cpu_to_node(int cpu)\n" "> \treturn numa_cpu_lookup_table[cpu];\n" @@ -371,7 +385,8 @@ "> \n" "> static inline cpumask_t node_to_cpumask(int node)\n" "> Index: linux-x86.q/include/asm-s390/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-s390/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-s390/percpu.h\n" "> +++ linux-x86.q/include/asm-s390/percpu.h\n" "> @@ -13,49 +13,25 @@\n" "> */\n" @@ -433,7 +448,8 @@ "> \n" "> #endif /* __ARCH_S390_PERCPU__ */\n" "> Index: linux-x86.q/include/asm-sparc64/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-sparc64/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-sparc64/percpu.h\n" "> +++ linux-x86.q/include/asm-sparc64/percpu.h\n" "> @@ -7,7 +7,6 @@ register unsigned long __local_per_cpu_o\n" "> \n" @@ -477,7 +493,8 @@ "> \n" "> #endif /* __ARCH_SPARC64_PERCPU__ */\n" "> Index: linux-x86.q/init/main.c\n" - "> =================================> --- linux-x86.q.orig/init/main.c\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/init/main.c\n" "> +++ linux-x86.q/init/main.c\n" "> @@ -374,18 +374,20 @@ EXPORT_SYMBOL(__per_cpu_offset);\n" "> \n" @@ -509,7 +526,8 @@ "> }\n" "> #endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */\n" "> Index: linux-x86.q/kernel/lockdep.c\n" - "> =================================> --- linux-x86.q.orig/kernel/lockdep.c\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/kernel/lockdep.c\n" "> +++ linux-x86.q/kernel/lockdep.c\n" "> @@ -609,8 +609,8 @@ static int static_obj(void *obj)\n" "> \t * percpu var?\n" @@ -523,4 +541,4 @@ "> \n" "> \t\tif ((addr >= start) && (addr < end))" -239811c7a594363af844a66bdbf0df76689280efcbe39002007dd445497078ed +4d1aacd2f1f6a1b8159370b4b1f9e93fc92e9a8993de695a7f1c28eb4ccb0c07
diff --git a/a/content_digest b/N2/content_digest index 226d150..a7ccf4b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,15 +8,15 @@ "Subject\0Re: x86/non-x86: percpu, node ids, apic ids x86.git fixup\0" "Date\0Wed, 30 Jan 2008 18:20:24 +0000\0" "To\0Ingo Molnar <mingo@elte.hu>\0" - "Cc\0Luck" + "Cc\0sparclinux@vger.kernel.org" + Luck Tony <tony.luck@intel.com> - Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> - Linus Torvalds <torvalds@linux-foundation.org> - Thomas Gleixner <tglx@linutronix.de> + linux-ia64@vger.kernel.org Linux Kernel Development <linux-kernel@vger.kernel.org> Linux/PPC Development <linuxppc-dev@ozlabs.org> - linux-ia64@vger.kernel.org - " sparclinux@vger.kernel.org\0" + Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> + Thomas Gleixner <tglx@linutronix.de> + " Linus Torvalds <torvalds@linux-foundation.org>\0" "\00:1\0" "b\0" "Ingo Molnar wrote:\n" @@ -523,4 +523,4 @@ "> \n" "> \t\tif ((addr >= start) && (addr < end))" -239811c7a594363af844a66bdbf0df76689280efcbe39002007dd445497078ed +629e3ff1cb94ccb4475f7e710a843df72dbfd97e135b2d0749efddaadc4c4003
diff --git a/a/1.txt b/N3/1.txt index 4b2c58f..42e481b 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -76,7 +76,8 @@ Mike > 18 files changed, 78 insertions(+), 125 deletions(-) > > Index: linux-x86.q/arch/ia64/Kconfig -> =================================> --- linux-x86.q.orig/arch/ia64/Kconfig +> =================================================================== +> --- linux-x86.q.orig/arch/ia64/Kconfig > +++ linux-x86.q/arch/ia64/Kconfig > @@ -80,7 +80,7 @@ config GENERIC_TIME_VSYSCALL > bool @@ -88,7 +89,8 @@ Mike > > config DMI > Index: linux-x86.q/arch/ia64/kernel/module.c -> =================================> --- linux-x86.q.orig/arch/ia64/kernel/module.c +> =================================================================== +> --- linux-x86.q.orig/arch/ia64/kernel/module.c > +++ linux-x86.q/arch/ia64/kernel/module.c > @@ -940,14 +940,3 @@ module_arch_cleanup (struct module *mod) > if (mod->arch.core_unw_table) @@ -106,7 +108,8 @@ Mike > -} > -#endif /* CONFIG_SMP */ > Index: linux-x86.q/arch/powerpc/Kconfig -> =================================> --- linux-x86.q.orig/arch/powerpc/Kconfig +> =================================================================== +> --- linux-x86.q.orig/arch/powerpc/Kconfig > +++ linux-x86.q/arch/powerpc/Kconfig > @@ -42,7 +42,7 @@ config GENERIC_HARDIRQS > bool @@ -118,7 +121,8 @@ Mike > > config IRQ_PER_CPU > Index: linux-x86.q/arch/sparc64/mm/init.c -> =================================> --- linux-x86.q.orig/arch/sparc64/mm/init.c +> =================================================================== +> --- linux-x86.q.orig/arch/sparc64/mm/init.c > +++ linux-x86.q/arch/sparc64/mm/init.c > @@ -1328,6 +1328,11 @@ pgd_t swapper_pg_dir[2048]; > static void sun4u_pgprot_init(void); @@ -133,7 +137,8 @@ Mike > { > unsigned long end_pfn, pages_avail, shift, phys_base; > Index: linux-x86.q/include/asm-alpha/topology.h -> =================================> --- linux-x86.q.orig/include/asm-alpha/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-alpha/topology.h > +++ linux-x86.q/include/asm-alpha/topology.h > @@ -6,6 +6,7 @@ > #include <asm/machvec.h> @@ -144,7 +149,8 @@ Mike > { > int node; > Index: linux-x86.q/include/asm-generic/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-generic/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-generic/percpu.h > +++ linux-x86.q/include/asm-generic/percpu.h > @@ -43,7 +43,12 @@ extern unsigned long __per_cpu_offset[NR > * Only S390 provides its own means of moving the pointer. @@ -161,7 +167,8 @@ Mike > > /* > Index: linux-x86.q/include/asm-generic/sections.h -> =================================> --- linux-x86.q.orig/include/asm-generic/sections.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-generic/sections.h > +++ linux-x86.q/include/asm-generic/sections.h > @@ -11,7 +11,17 @@ extern char _sinittext[], _einittext[]; > extern char _sextratext[] __attribute__((weak)); @@ -182,7 +189,8 @@ Mike > extern char __initdata_begin[], __initdata_end[]; > extern char __start_rodata[], __end_rodata[]; > Index: linux-x86.q/include/asm-generic/topology.h -> =================================> --- linux-x86.q.orig/include/asm-generic/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-generic/topology.h > +++ linux-x86.q/include/asm-generic/topology.h > @@ -32,6 +32,9 @@ > #ifndef cpu_to_node @@ -195,7 +203,8 @@ Mike > #define parent_node(node) (0) > #endif > Index: linux-x86.q/include/asm-generic/vmlinux.lds.h -> =================================> --- linux-x86.q.orig/include/asm-generic/vmlinux.lds.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-generic/vmlinux.lds.h > +++ linux-x86.q/include/asm-generic/vmlinux.lds.h > @@ -341,6 +341,20 @@ > *(.initcall7.init) \ @@ -224,7 +233,8 @@ Mike > __per_cpu_end = .; > +#endif > Index: linux-x86.q/include/asm-ia64/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-ia64/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-ia64/percpu.h > +++ linux-x86.q/include/asm-ia64/percpu.h > @@ -19,34 +19,14 @@ > # define PER_CPU_ATTRIBUTES __attribute__((__model__ (__small__))) @@ -277,7 +287,8 @@ Mike > #endif /* !__ASSEMBLY__ */ > > Index: linux-x86.q/include/asm-ia64/topology.h -> =================================> --- linux-x86.q.orig/include/asm-ia64/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-ia64/topology.h > +++ linux-x86.q/include/asm-ia64/topology.h > @@ -31,6 +31,7 @@ > * Returns the number of the node containing CPU 'cpu' @@ -288,7 +299,8 @@ Mike > /* > * Returns a bitmask of CPUs on Node 'node'. > Index: linux-x86.q/include/asm-mips/mach-ip27/topology.h -> =================================> --- linux-x86.q.orig/include/asm-mips/mach-ip27/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-mips/mach-ip27/topology.h > +++ linux-x86.q/include/asm-mips/mach-ip27/topology.h > @@ -23,6 +23,7 @@ struct cpuinfo_ip27 { > extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS]; @@ -299,7 +311,8 @@ Mike > #define node_to_cpumask(node) (hub_data(node)->h_cpus) > #define node_to_first_cpu(node) (first_cpu(node_to_cpumask(node))) > Index: linux-x86.q/include/asm-powerpc/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-powerpc/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-powerpc/percpu.h > +++ linux-x86.q/include/asm-powerpc/percpu.h > @@ -16,34 +16,9 @@ > #define __my_cpu_offset() get_paca()->data_offset @@ -339,7 +352,8 @@ Mike > > #endif /* _ASM_POWERPC_PERCPU_H_ */ > Index: linux-x86.q/include/asm-powerpc/topology.h -> =================================> --- linux-x86.q.orig/include/asm-powerpc/topology.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-powerpc/topology.h > +++ linux-x86.q/include/asm-powerpc/topology.h > @@ -15,6 +15,7 @@ static inline int cpu_to_node(int cpu) > return numa_cpu_lookup_table[cpu]; @@ -350,7 +364,8 @@ Mike > > static inline cpumask_t node_to_cpumask(int node) > Index: linux-x86.q/include/asm-s390/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-s390/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-s390/percpu.h > +++ linux-x86.q/include/asm-s390/percpu.h > @@ -13,49 +13,25 @@ > */ @@ -412,7 +427,8 @@ Mike > > #endif /* __ARCH_S390_PERCPU__ */ > Index: linux-x86.q/include/asm-sparc64/percpu.h -> =================================> --- linux-x86.q.orig/include/asm-sparc64/percpu.h +> =================================================================== +> --- linux-x86.q.orig/include/asm-sparc64/percpu.h > +++ linux-x86.q/include/asm-sparc64/percpu.h > @@ -7,7 +7,6 @@ register unsigned long __local_per_cpu_o > @@ -456,7 +472,8 @@ Mike > > #endif /* __ARCH_SPARC64_PERCPU__ */ > Index: linux-x86.q/init/main.c -> =================================> --- linux-x86.q.orig/init/main.c +> =================================================================== +> --- linux-x86.q.orig/init/main.c > +++ linux-x86.q/init/main.c > @@ -374,18 +374,20 @@ EXPORT_SYMBOL(__per_cpu_offset); > @@ -488,7 +505,8 @@ Mike > } > #endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */ > Index: linux-x86.q/kernel/lockdep.c -> =================================> --- linux-x86.q.orig/kernel/lockdep.c +> =================================================================== +> --- linux-x86.q.orig/kernel/lockdep.c > +++ linux-x86.q/kernel/lockdep.c > @@ -609,8 +609,8 @@ static int static_obj(void *obj) > * percpu var? diff --git a/a/content_digest b/N3/content_digest index 226d150..543bc59 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -6,7 +6,7 @@ "ref\020080130180623.GA24881@elte.hu\0" "From\0Mike Travis <travis@sgi.com>\0" "Subject\0Re: x86/non-x86: percpu, node ids, apic ids x86.git fixup\0" - "Date\0Wed, 30 Jan 2008 18:20:24 +0000\0" + "Date\0Wed, 30 Jan 2008 10:20:24 -0800\0" "To\0Ingo Molnar <mingo@elte.hu>\0" "Cc\0Luck" Tony <tony.luck@intel.com> @@ -97,7 +97,8 @@ "> 18 files changed, 78 insertions(+), 125 deletions(-)\n" "> \n" "> Index: linux-x86.q/arch/ia64/Kconfig\n" - "> =================================> --- linux-x86.q.orig/arch/ia64/Kconfig\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/arch/ia64/Kconfig\n" "> +++ linux-x86.q/arch/ia64/Kconfig\n" "> @@ -80,7 +80,7 @@ config GENERIC_TIME_VSYSCALL\n" "> \tbool\n" @@ -109,7 +110,8 @@ "> \n" "> config DMI\n" "> Index: linux-x86.q/arch/ia64/kernel/module.c\n" - "> =================================> --- linux-x86.q.orig/arch/ia64/kernel/module.c\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/arch/ia64/kernel/module.c\n" "> +++ linux-x86.q/arch/ia64/kernel/module.c\n" "> @@ -940,14 +940,3 @@ module_arch_cleanup (struct module *mod)\n" "> \tif (mod->arch.core_unw_table)\n" @@ -127,7 +129,8 @@ "> -}\n" "> -#endif /* CONFIG_SMP */\n" "> Index: linux-x86.q/arch/powerpc/Kconfig\n" - "> =================================> --- linux-x86.q.orig/arch/powerpc/Kconfig\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/arch/powerpc/Kconfig\n" "> +++ linux-x86.q/arch/powerpc/Kconfig\n" "> @@ -42,7 +42,7 @@ config GENERIC_HARDIRQS\n" "> \tbool\n" @@ -139,7 +142,8 @@ "> \n" "> config IRQ_PER_CPU\n" "> Index: linux-x86.q/arch/sparc64/mm/init.c\n" - "> =================================> --- linux-x86.q.orig/arch/sparc64/mm/init.c\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/arch/sparc64/mm/init.c\n" "> +++ linux-x86.q/arch/sparc64/mm/init.c\n" "> @@ -1328,6 +1328,11 @@ pgd_t swapper_pg_dir[2048];\n" "> static void sun4u_pgprot_init(void);\n" @@ -154,7 +158,8 @@ "> {\n" "> \tunsigned long end_pfn, pages_avail, shift, phys_base;\n" "> Index: linux-x86.q/include/asm-alpha/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-alpha/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-alpha/topology.h\n" "> +++ linux-x86.q/include/asm-alpha/topology.h\n" "> @@ -6,6 +6,7 @@\n" "> #include <asm/machvec.h>\n" @@ -165,7 +170,8 @@ "> {\n" "> \tint node;\n" "> Index: linux-x86.q/include/asm-generic/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-generic/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-generic/percpu.h\n" "> +++ linux-x86.q/include/asm-generic/percpu.h\n" "> @@ -43,7 +43,12 @@ extern unsigned long __per_cpu_offset[NR\n" "> * Only S390 provides its own means of moving the pointer.\n" @@ -182,7 +188,8 @@ "> \n" "> /*\n" "> Index: linux-x86.q/include/asm-generic/sections.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-generic/sections.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-generic/sections.h\n" "> +++ linux-x86.q/include/asm-generic/sections.h\n" "> @@ -11,7 +11,17 @@ extern char _sinittext[], _einittext[];\n" "> extern char _sextratext[] __attribute__((weak));\n" @@ -203,7 +210,8 @@ "> extern char __initdata_begin[], __initdata_end[];\n" "> extern char __start_rodata[], __end_rodata[];\n" "> Index: linux-x86.q/include/asm-generic/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-generic/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-generic/topology.h\n" "> +++ linux-x86.q/include/asm-generic/topology.h\n" "> @@ -32,6 +32,9 @@\n" "> #ifndef cpu_to_node\n" @@ -216,7 +224,8 @@ "> #define parent_node(node)\t(0)\n" "> #endif\n" "> Index: linux-x86.q/include/asm-generic/vmlinux.lds.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-generic/vmlinux.lds.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-generic/vmlinux.lds.h\n" "> +++ linux-x86.q/include/asm-generic/vmlinux.lds.h\n" "> @@ -341,6 +341,20 @@\n" "> \t*(.initcall7.init)\t\t\t\t\t\t\\\n" @@ -245,7 +254,8 @@ "> \t__per_cpu_end = .;\n" "> +#endif\n" "> Index: linux-x86.q/include/asm-ia64/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-ia64/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-ia64/percpu.h\n" "> +++ linux-x86.q/include/asm-ia64/percpu.h\n" "> @@ -19,34 +19,14 @@\n" "> # define PER_CPU_ATTRIBUTES\t__attribute__((__model__ (__small__)))\n" @@ -298,7 +308,8 @@ "> #endif /* !__ASSEMBLY__ */\n" "> \n" "> Index: linux-x86.q/include/asm-ia64/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-ia64/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-ia64/topology.h\n" "> +++ linux-x86.q/include/asm-ia64/topology.h\n" "> @@ -31,6 +31,7 @@\n" "> * Returns the number of the node containing CPU 'cpu'\n" @@ -309,7 +320,8 @@ "> /*\n" "> * Returns a bitmask of CPUs on Node 'node'.\n" "> Index: linux-x86.q/include/asm-mips/mach-ip27/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-mips/mach-ip27/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-mips/mach-ip27/topology.h\n" "> +++ linux-x86.q/include/asm-mips/mach-ip27/topology.h\n" "> @@ -23,6 +23,7 @@ struct cpuinfo_ip27 {\n" "> extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];\n" @@ -320,7 +332,8 @@ "> #define node_to_cpumask(node)\t(hub_data(node)->h_cpus)\n" "> #define node_to_first_cpu(node)\t(first_cpu(node_to_cpumask(node)))\n" "> Index: linux-x86.q/include/asm-powerpc/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-powerpc/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-powerpc/percpu.h\n" "> +++ linux-x86.q/include/asm-powerpc/percpu.h\n" "> @@ -16,34 +16,9 @@\n" "> #define __my_cpu_offset() get_paca()->data_offset\n" @@ -360,7 +373,8 @@ "> \n" "> #endif /* _ASM_POWERPC_PERCPU_H_ */\n" "> Index: linux-x86.q/include/asm-powerpc/topology.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-powerpc/topology.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-powerpc/topology.h\n" "> +++ linux-x86.q/include/asm-powerpc/topology.h\n" "> @@ -15,6 +15,7 @@ static inline int cpu_to_node(int cpu)\n" "> \treturn numa_cpu_lookup_table[cpu];\n" @@ -371,7 +385,8 @@ "> \n" "> static inline cpumask_t node_to_cpumask(int node)\n" "> Index: linux-x86.q/include/asm-s390/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-s390/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-s390/percpu.h\n" "> +++ linux-x86.q/include/asm-s390/percpu.h\n" "> @@ -13,49 +13,25 @@\n" "> */\n" @@ -433,7 +448,8 @@ "> \n" "> #endif /* __ARCH_S390_PERCPU__ */\n" "> Index: linux-x86.q/include/asm-sparc64/percpu.h\n" - "> =================================> --- linux-x86.q.orig/include/asm-sparc64/percpu.h\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/include/asm-sparc64/percpu.h\n" "> +++ linux-x86.q/include/asm-sparc64/percpu.h\n" "> @@ -7,7 +7,6 @@ register unsigned long __local_per_cpu_o\n" "> \n" @@ -477,7 +493,8 @@ "> \n" "> #endif /* __ARCH_SPARC64_PERCPU__ */\n" "> Index: linux-x86.q/init/main.c\n" - "> =================================> --- linux-x86.q.orig/init/main.c\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/init/main.c\n" "> +++ linux-x86.q/init/main.c\n" "> @@ -374,18 +374,20 @@ EXPORT_SYMBOL(__per_cpu_offset);\n" "> \n" @@ -509,7 +526,8 @@ "> }\n" "> #endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */\n" "> Index: linux-x86.q/kernel/lockdep.c\n" - "> =================================> --- linux-x86.q.orig/kernel/lockdep.c\n" + "> ===================================================================\n" + "> --- linux-x86.q.orig/kernel/lockdep.c\n" "> +++ linux-x86.q/kernel/lockdep.c\n" "> @@ -609,8 +609,8 @@ static int static_obj(void *obj)\n" "> \t * percpu var?\n" @@ -523,4 +541,4 @@ "> \n" "> \t\tif ((addr >= start) && (addr < end))" -239811c7a594363af844a66bdbf0df76689280efcbe39002007dd445497078ed +0ce83e5fb8784e7054b898dc26d7647a2eae429bbbea9ac3e26fc8c44868dfd6
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.