diff for duplicates of <1423850799-4028-1-git-send-email-sboyd@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 9790029..3c21b2c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -132,8 +132,8 @@ index fe0386c751b2..160aa14c4a75 100644 * since this is special on a lot of platforms, e.g. because * of clock tick interrupts. */ -- return cpu = 0 ? -EPERM : 0; -+ return cpu = 0 ? 0 : 1; +- return cpu == 0 ? -EPERM : 0; ++ return cpu == 0 ? 0 : 1; } + /* @@ -190,7 +190,7 @@ index 3f761f839043..b45206f93ddf 100644 -static int r8a7779_cpu_disable(unsigned int cpu) -{ - /* only CPU1->3 have power domains, do not allow hotplug of CPU0 */ -- return cpu = 0 ? -EPERM : 0; +- return cpu == 0 ? -EPERM : 0; -} #endif /* CONFIG_HOTPLUG_CPU */ diff --git a/a/content_digest b/N1/content_digest index 5b47e59..f19eb5d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" "Subject\0[PATCH v2] ARM: smp: Only expose /sys/.../cpuX/online if hotpluggable\0" - "Date\0Fri, 13 Feb 2015 18:06:39 +0000\0" + "Date\0Fri, 13 Feb 2015 10:06:39 -0800\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -138,8 +138,8 @@ " \t * since this is special on a lot of platforms, e.g. because\n" " \t * of clock tick interrupts.\n" " \t */\n" - "-\treturn cpu = 0 ? -EPERM : 0;\n" - "+\treturn cpu = 0 ? 0 : 1;\n" + "-\treturn cpu == 0 ? -EPERM : 0;\n" + "+\treturn cpu == 0 ? 0 : 1;\n" " }\n" "+\n" " /*\n" @@ -196,7 +196,7 @@ "-static int r8a7779_cpu_disable(unsigned int cpu)\n" "-{\n" "-\t/* only CPU1->3 have power domains, do not allow hotplug of CPU0 */\n" - "-\treturn cpu = 0 ? -EPERM : 0;\n" + "-\treturn cpu == 0 ? -EPERM : 0;\n" "-}\n" " #endif /* CONFIG_HOTPLUG_CPU */\n" " \n" @@ -251,4 +251,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" a Linux Foundation Collaborative Project -4683dbe00af79fbc062d166d0fd1c7e68cf263e2b8ee56048ebd5326d45d92b0 +a97d00b9d859c39cdd0ca5ae2511bc7a24b4f3f3e8a580d48f0f74f8a47cb265
diff --git a/a/1.txt b/N2/1.txt index 9790029..3c21b2c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -132,8 +132,8 @@ index fe0386c751b2..160aa14c4a75 100644 * since this is special on a lot of platforms, e.g. because * of clock tick interrupts. */ -- return cpu = 0 ? -EPERM : 0; -+ return cpu = 0 ? 0 : 1; +- return cpu == 0 ? -EPERM : 0; ++ return cpu == 0 ? 0 : 1; } + /* @@ -190,7 +190,7 @@ index 3f761f839043..b45206f93ddf 100644 -static int r8a7779_cpu_disable(unsigned int cpu) -{ - /* only CPU1->3 have power domains, do not allow hotplug of CPU0 */ -- return cpu = 0 ? -EPERM : 0; +- return cpu == 0 ? -EPERM : 0; -} #endif /* CONFIG_HOTPLUG_CPU */ diff --git a/a/content_digest b/N2/content_digest index 5b47e59..8ad9a07 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,15 @@ "From\0Stephen Boyd <sboyd@codeaurora.org>\0" "Subject\0[PATCH v2] ARM: smp: Only expose /sys/.../cpuX/online if hotpluggable\0" - "Date\0Fri, 13 Feb 2015 18:06:39 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Fri, 13 Feb 2015 10:06:39 -0800\0" + "To\0Russell King <linux@arm.linux.org.uk>\0" + "Cc\0linux-kernel@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + Mark Rutland <mark.rutland@arm.com> + Nicolas Pitre <nico@linaro.org> + Dave Martin <Dave.Martin@arm.com> + Simon Horman <horms@verge.net.au> + Magnus Damm <magnus.damm@gmail.com> + " <linux-sh@vger.kernel.org>\0" "\00:1\0" "b\0" "Writes to /sys/.../cpuX/online fail if we determine the platform\n" @@ -138,8 +146,8 @@ " \t * since this is special on a lot of platforms, e.g. because\n" " \t * of clock tick interrupts.\n" " \t */\n" - "-\treturn cpu = 0 ? -EPERM : 0;\n" - "+\treturn cpu = 0 ? 0 : 1;\n" + "-\treturn cpu == 0 ? -EPERM : 0;\n" + "+\treturn cpu == 0 ? 0 : 1;\n" " }\n" "+\n" " /*\n" @@ -196,7 +204,7 @@ "-static int r8a7779_cpu_disable(unsigned int cpu)\n" "-{\n" "-\t/* only CPU1->3 have power domains, do not allow hotplug of CPU0 */\n" - "-\treturn cpu = 0 ? -EPERM : 0;\n" + "-\treturn cpu == 0 ? -EPERM : 0;\n" "-}\n" " #endif /* CONFIG_HOTPLUG_CPU */\n" " \n" @@ -251,4 +259,4 @@ "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" a Linux Foundation Collaborative Project -4683dbe00af79fbc062d166d0fd1c7e68cf263e2b8ee56048ebd5326d45d92b0 +59336cd0c03f12f3a69e24ef4069cdd34c676c4f809daed5f68cddce21c5280b
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.