diff for duplicates of <20130731070721.14444.80422.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index aeaff6a..8c00c41 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,13 +30,13 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + unsigned int lcpu = cpu_logical_map(cpu); + int ret; -- if (((__raw_readl(PSTR) >> (4 * cpu)) & 3) = 3) +- if (((__raw_readl(PSTR) >> (4 * cpu)) & 3) == 3) - __raw_writel(1 << cpu, WUPCR); /* wake up */ + ret = shmobile_smp_scu_boot_secondary(cpu, idle); + if (ret) + return ret; + -+ if (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) = 3) ++ if (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) == 3) + __raw_writel(1 << lcpu, WUPCR); /* wake up */ else - __raw_writel(1 << cpu, SRESCR); /* reset */ diff --git a/a/content_digest b/N1/content_digest index 8bc29db..def73ad 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130731070702.14444.64961.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 02/07] ARM: shmobile: Use shared SCU SMP boot code on sh73a0\0" - "Date\0Wed, 31 Jul 2013 07:07:21 +0000\0" + "Date\0Wed, 31 Jul 2013 16:07:21 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -37,13 +37,13 @@ "+\tunsigned int lcpu = cpu_logical_map(cpu);\n" "+\tint ret;\n" " \n" - "-\tif (((__raw_readl(PSTR) >> (4 * cpu)) & 3) = 3)\n" + "-\tif (((__raw_readl(PSTR) >> (4 * cpu)) & 3) == 3)\n" "-\t\t__raw_writel(1 << cpu, WUPCR);\t/* wake up */\n" "+\tret = shmobile_smp_scu_boot_secondary(cpu, idle);\n" "+\tif (ret)\n" "+\t\treturn ret;\n" "+\n" - "+\tif (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) = 3)\n" + "+\tif (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) == 3)\n" "+\t\t__raw_writel(1 << lcpu, WUPCR);\t/* wake up */\n" " \telse\n" "-\t\t__raw_writel(1 << cpu, SRESCR);\t/* reset */\n" @@ -74,4 +74,4 @@ " \n" #ifdef CONFIG_HOTPLUG_CPU -1bba99b8bf55df18d6fa6e6ef795e935ae35182fe1923fd88c89d12d87b4121f +0f0bd0dd5488d014cccbe9b995643db32ce2fb2e73b6193ce6268417e7093d3c
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.