diff for duplicates of <20130218134754.17303.4405.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index ba6d2c3..b87e2bb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,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; @@ -67,7 +67,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) @@ -82,7 +82,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; @@ -122,7 +122,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> +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 42c786c..15852cd 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 07/08] ARM: shmobile: Rearrange r8a7779 cpu hotplug code\0" - "Date\0Mon, 18 Feb 2013 13:47:54 +0000\0" + "Date\0Mon, 18 Feb 2013 22:47:54 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -27,7 +27,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" @@ -74,7 +74,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" @@ -89,7 +89,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" @@ -129,7 +129,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" @@ -137,4 +137,4 @@ " \t.smp_init_cpus\t\t= r8a7779_smp_init_cpus,\n" " \t.smp_prepare_cpus\t= r8a7779_smp_prepare_cpus," -34416ec551776ae2f2ba0c3aedc7951023afcd9459c017fdef57b9f213875238 +c8e07ec58f6ef91d9cbd8378ad84969568866044438136b25ef92aefa60ed1f3
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.