diff for duplicates of <20060104010658.A16342@unix-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index 250d261..3b430ac 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -250,7 +250,8 @@ diff -Nraup linux-2.6.15-rc5/drivers/base/topology.c linux-2.6.15-rc5_topology/d + return NOTIFY_OK; +} + -+static struct notifier_block topology_cpu_notifier +{ ++static struct notifier_block topology_cpu_notifier = ++{ + .notifier_call = topology_cpu_callback, +}; + @@ -279,9 +280,9 @@ diff -Nraup linux-2.6.15-rc5/include/asm-i386/topology.h linux-2.6.15-rc5_topolo +#ifdef CONFIG_SMP +#define topology_physical_package_id(cpu) \ -+ ((int)(phys_proc_id[cpu] = BAD_APICID ? -1 : phys_proc_id[cpu])) ++ ((int)(phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu])) +#define topology_core_id(cpu) \ -+ ((int)(cpu_core_id[cpu] = BAD_APICID ? 0 : cpu_core_id[cpu])) ++ ((int)(cpu_core_id[cpu] == BAD_APICID ? 0 : cpu_core_id[cpu])) +#define topology_core_siblings(cpu) cpu_core_map[cpu] +#define topology_thread_siblings(cpu) cpu_sibling_map[cpu] +#endif @@ -315,9 +316,9 @@ diff -Nraup linux-2.6.15-rc5/include/asm-x86_64/topology.h linux-2.6.15-rc5_topo +#ifdef CONFIG_SMP +#define topology_physical_package_id(cpu) \ -+ ((int)(phys_proc_id[cpu] = BAD_APICID ? -1 : phys_proc_id[cpu])) ++ ((int)(phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu])) +#define topology_core_id(cpu) \ -+ ((int)(cpu_core_id[cpu] = BAD_APICID ? 0 : cpu_core_id[cpu])) ++ ((int)(cpu_core_id[cpu] == BAD_APICID ? 0 : cpu_core_id[cpu])) +#define topology_core_siblings(cpu) cpu_core_map[cpu] +#define topology_thread_siblings(cpu) cpu_sibling_map[cpu] +#endif diff --git a/a/content_digest b/N1/content_digest index bc78d5f..726625b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\08126E4F969BA254AB43EA03C59F44E84045838F8@pdsmsx404\0" "From\0Yanmin Zhang <ymzhang@unix-os.sc.intel.com>\0" "Subject\0Re: [PATCH v3]Export cpu topology by sysfs\0" - "Date\0Wed, 04 Jan 2006 09:06:58 +0000\0" + "Date\0Wed, 4 Jan 2006 01:06:58 -0800\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Nathan Lynch <ntl@pobox.com>" greg@kroah.com @@ -267,7 +267,8 @@ "+\treturn NOTIFY_OK;\n" "+}\n" "+\n" - "+static struct notifier_block topology_cpu_notifier +{\n" + "+static struct notifier_block topology_cpu_notifier =\n" + "+{\n" "+\t.notifier_call = topology_cpu_callback,\n" "+};\n" "+\n" @@ -296,9 +297,9 @@ " \n" "+#ifdef CONFIG_SMP\n" "+#define topology_physical_package_id(cpu)\t\t\t\t\\\n" - "+\t((int)(phys_proc_id[cpu] = BAD_APICID ? -1 : phys_proc_id[cpu]))\n" + "+\t((int)(phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu]))\n" "+#define topology_core_id(cpu)\t\t\t\t\t\t\\\n" - "+\t((int)(cpu_core_id[cpu] = BAD_APICID ? 0 : cpu_core_id[cpu]))\n" + "+\t((int)(cpu_core_id[cpu] == BAD_APICID ? 0 : cpu_core_id[cpu]))\n" "+#define topology_core_siblings(cpu)\t\tcpu_core_map[cpu]\n" "+#define topology_thread_siblings(cpu)\t\tcpu_sibling_map[cpu]\n" "+#endif\n" @@ -332,9 +333,9 @@ " \n" "+#ifdef CONFIG_SMP\n" "+#define topology_physical_package_id(cpu)\t\t\t\t\\\n" - "+\t((int)(phys_proc_id[cpu] = BAD_APICID ? -1 : phys_proc_id[cpu]))\n" + "+\t((int)(phys_proc_id[cpu] == BAD_APICID ? -1 : phys_proc_id[cpu]))\n" "+#define topology_core_id(cpu)\t\t\t\t\t\t\\\n" - "+\t((int)(cpu_core_id[cpu] = BAD_APICID ? 0 : cpu_core_id[cpu]))\n" + "+\t((int)(cpu_core_id[cpu] == BAD_APICID ? 0 : cpu_core_id[cpu]))\n" "+#define topology_core_siblings(cpu)\t\tcpu_core_map[cpu]\n" "+#define topology_thread_siblings(cpu)\t\tcpu_sibling_map[cpu]\n" "+#endif\n" @@ -343,4 +344,4 @@ " \n" #endif -683c62156f489e0f8114e52f28aa26f8985eac1e59811ab14b10ee9940068327 +a19d11dc337dbca2c0f81a323c24e76f0e84eafff6ae8484385972b808b4cfc6
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.