diff for duplicates of <20130218134725.17303.98038.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 8b032b9..b7eeb8c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> +{ + unsigned long mask = 3 << (cpu * 8); + -+ if ((__raw_readl(shmobile_scu_base + 8) & mask) = mask) ++ if ((__raw_readl(shmobile_scu_base + 8) & mask) == mask) + return 1; + + return 0; @@ -78,7 +78,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> +static int __maybe_unused 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; +} static void __cpuinit r8a7779_secondary_init(unsigned int cpu) diff --git a/a/content_digest b/N1/content_digest index 23e399b..8ad6d93 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130218134648.17303.97576.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 04/08] ARM: shmobile: Update r8a7779 to check SCU for hotplug\0" - "Date\0Mon, 18 Feb 2013 13:47:25 +0000\0" + "Date\0Mon, 18 Feb 2013 22:47:25 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -37,7 +37,7 @@ "+{\n" "+\tunsigned long mask = 3 << (cpu * 8);\n" "+\n" - "+\tif ((__raw_readl(shmobile_scu_base + 8) & mask) = mask)\n" + "+\tif ((__raw_readl(shmobile_scu_base + 8) & mask) == mask)\n" "+\t\treturn 1;\n" "+\n" "+\treturn 0;\n" @@ -85,7 +85,7 @@ "+static int __maybe_unused 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" " \n" " static void __cpuinit r8a7779_secondary_init(unsigned int cpu)\n" @@ -101,4 +101,4 @@ " #endif\n" }; -3392252aa68825c526c1f0b8c664483e343e2335135eb56aee49aed7386beebc +fe5b6ff2dd1f1ffce73200245c3d9590b1689fa0e3364d1e3fe928e5cef7a205
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.