diff for duplicates of <1329364286.27544.rusty@rustcorp.com.au> diff --git a/a/1.txt b/N1/1.txt index 9f58b2a..57dcc0f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ index 5207035..2ad7328 100644 - * cpu_present_map on the other hand can change dynamically. + * cpu_present_mask on the other hand can change dynamically. * In case when cpu_hotplug is not compiled, then we resort to current - * behaviour, which is cpu_possible = cpu_present. + * behaviour, which is cpu_possible == cpu_present. * - Ashok Raj @@ -922,7 +922,7 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu) @@ -71,9 +71,9 @@ index 782c3a35..51da772 100644 + cpumask_and(&mask, &domain, cpu_online_mask); if (cpus_empty(mask)) return -EINVAL; - if ((cfg->vector = vector) && cpus_equal(cfg->domain, domain)) + if ((cfg->vector == vector) && cpus_equal(cfg->domain, domain)) @@ -179,7 +179,7 @@ static void __clear_irq_vector(int irq) - BUG_ON(cfg->vector = IRQ_VECTOR_UNASSIGNED); + BUG_ON(cfg->vector == IRQ_VECTOR_UNASSIGNED); vector = cfg->vector; domain = cfg->domain; - cpus_and(mask, cfg->domain, cpu_online_map); diff --git a/a/content_digest b/N1/content_digest index f72296f..294e555 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,12 @@ "From\0Rusty Russell <rusty@rustcorp.com.au>\0" "Subject\0[PATCH 2/5] arch/ia64: remove references to cpu_*_map.\0" - "Date\0Thu, 16 Feb 2012 03:53:06 +0000\0" + "Date\0Thu, 16 Feb 2012 14:21:26 +1030\0" "To\0Tony Luck <tony.luck@intel.com>" Fenghua Yu <fenghua.yu@intel.com> " linux-ia64@vger.kernel.org\0" "Cc\0linux-kernel@vger.kernel.org\0" + "Cc\0Andrew Morton <akpm@linux-foundation.org>\0" + "Cc\0srivatsa.bhat@linux.vnet.ibm.com\0" "\00:1\0" "b\0" "From: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>\n" @@ -39,7 +41,7 @@ "- * cpu_present_map on the other hand can change dynamically.\n" "+ * cpu_present_mask on the other hand can change dynamically.\n" " * In case when cpu_hotplug is not compiled, then we resort to current\n" - " * behaviour, which is cpu_possible = cpu_present.\n" + " * behaviour, which is cpu_possible == cpu_present.\n" " * - Ashok Raj\n" "@@ -922,7 +922,7 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)\n" " \n" @@ -80,9 +82,9 @@ "+\tcpumask_and(&mask, &domain, cpu_online_mask);\n" " \tif (cpus_empty(mask))\n" " \t\treturn -EINVAL;\n" - " \tif ((cfg->vector = vector) && cpus_equal(cfg->domain, domain))\n" + " \tif ((cfg->vector == vector) && cpus_equal(cfg->domain, domain))\n" "@@ -179,7 +179,7 @@ static void __clear_irq_vector(int irq)\n" - " \tBUG_ON(cfg->vector = IRQ_VECTOR_UNASSIGNED);\n" + " \tBUG_ON(cfg->vector == IRQ_VECTOR_UNASSIGNED);\n" " \tvector = cfg->vector;\n" " \tdomain = cfg->domain;\n" "-\tcpus_and(mask, cfg->domain, cpu_online_map);\n" @@ -260,4 +262,4 @@ " \tlen += sprintf(buf+len, \"\\n\");\n" " \treturn len;" -ead8b96b3f42e7d68904ed6a5adbcecce1d7429a552b7aeca6b3ccd0151f597f +1c7ff73797816586646df3afcf166efc8df67ef488580a48a3b0c2ad153a43a0
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.