diff for duplicates of <20100106045525.082530491@samba.org> diff --git a/a/1.txt b/N1/1.txt index c55a97a..64c27b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,14 +19,15 @@ Signed-off-by: Anton Blanchard <anton@samba.org> --- Index: linux-cpumask/arch/ia64/include/asm/topology.h -=================================--- linux-cpumask.orig/arch/ia64/include/asm/topology.h 2010-01-06 15:20:22.832584260 +1100 +=================================================================== +--- linux-cpumask.orig/arch/ia64/include/asm/topology.h 2010-01-06 15:20:22.832584260 +1100 +++ linux-cpumask/arch/ia64/include/asm/topology.h 2010-01-06 15:26:46.620650121 +1100 @@ -33,7 +33,9 @@ /* * Returns a bitmask of CPUs on Node 'node'. */ -#define cpumask_of_node(node) (&node_to_cpu_mask[node]) -+#define cpumask_of_node(node) ((node) = -1 ? \ ++#define cpumask_of_node(node) ((node) == -1 ? \ + cpu_all_mask : \ + &node_to_cpu_mask[node]) diff --git a/a/content_digest b/N1/content_digest index 2f6d164..d3d5012 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020100106045509.245662398@samba.org\0" "From\0Anton Blanchard <anton@samba.org>\0" "Subject\0[patch 3/6] ia64: cpumask_of_node() should handle -1 as a node\0" - "Date\0Wed, 06 Jan 2010 04:55:12 +0000\0" + "Date\0Wed, 06 Jan 2010 15:55:12 +1100\0" "To\0Tony Luck <tony.luck@intel.com>" " Fenghua Yu <fenghua.yu@intel.com>\0" "Cc\0linux-ia64@vger.kernel.org" @@ -31,14 +31,15 @@ "---\n" "\n" "Index: linux-cpumask/arch/ia64/include/asm/topology.h\n" - "=================================--- linux-cpumask.orig/arch/ia64/include/asm/topology.h\t2010-01-06 15:20:22.832584260 +1100\n" + "===================================================================\n" + "--- linux-cpumask.orig/arch/ia64/include/asm/topology.h\t2010-01-06 15:20:22.832584260 +1100\n" "+++ linux-cpumask/arch/ia64/include/asm/topology.h\t2010-01-06 15:26:46.620650121 +1100\n" "@@ -33,7 +33,9 @@\n" " /*\n" " * Returns a bitmask of CPUs on Node 'node'.\n" " */\n" "-#define cpumask_of_node(node) (&node_to_cpu_mask[node])\n" - "+#define cpumask_of_node(node) ((node) = -1 ?\t\t\t\t\\\n" + "+#define cpumask_of_node(node) ((node) == -1 ?\t\t\t\t\\\n" "+\t\t\t cpu_all_mask :\t\t\t\t\\\n" "+\t\t\t &node_to_cpu_mask[node])\n" " \n" @@ -47,4 +48,4 @@ "\n" -- -5400ac43461ad98af3bbfc0ae36d554f20a0a159d214e495d9f82dee47f29517 +460ff3196111f0a5c81e97602bb80838eae4581e921312377dae3b6add21d76c
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.