diff for duplicates of <20130807224510.9832.38560.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 0501bf4..4489f66 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ Introduce shared APMU SMP code for mach-shmobile. Both SMP boot up and CPU Hotplug is supported. DT is used for configuration of the APMU hardware block, as the following r8a73a4 example shows: - apmu@e6152000 { + apmu at e6152000 { compatible = "renesas,r8a73a4-apmu", "renesas,apmu"; reg = <0 0xe6152000 0 0x88>; cpus = <&cpu0 &cpu1 &cpu2 &cpu3>; @@ -96,7 +96,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + int k; + + for (k = 0; k < 1000; k++) { -+ if (((readl_relaxed(p + PSTR_OFFS) >> (bit * 4)) & 0x03) = 3) ++ if (((readl_relaxed(p + PSTR_OFFS) >> (bit * 4)) & 0x03) == 3) + return 1; + + mdelay(1); @@ -147,7 +147,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + np_cpu = of_parse_phandle(np_apmu, "cpus", bit); + if (np_cpu) { + if (!of_property_read_u32(np_cpu, "reg", &id)) { -+ if (id = cpu_logical_map(0)) ++ if (id == cpu_logical_map(0)) + is_allowed = true; + } + of_node_put(np_cpu); diff --git a/a/content_digest b/N1/content_digest index 8c86173..a17aa05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH] ARM: shmobile: Shared APMU SMP support code\0" - "Date\0Wed, 07 Aug 2013 22:45:10 +0000\0" + "Date\0Thu, 08 Aug 2013 07:45:10 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -10,7 +10,7 @@ "and CPU Hotplug is supported. DT is used for configuration of the\n" "APMU hardware block, as the following r8a73a4 example shows:\n" "\n" - " apmu@e6152000 {\n" + " apmu at e6152000 {\n" " compatible = \"renesas,r8a73a4-apmu\", \"renesas,apmu\";\n" " reg = <0 0xe6152000 0 0x88>;\n" " cpus = <&cpu0 &cpu1 &cpu2 &cpu3>;\n" @@ -102,7 +102,7 @@ "+\tint k;\n" "+\n" "+\tfor (k = 0; k < 1000; k++) {\n" - "+\t\tif (((readl_relaxed(p + PSTR_OFFS) >> (bit * 4)) & 0x03) = 3)\n" + "+\t\tif (((readl_relaxed(p + PSTR_OFFS) >> (bit * 4)) & 0x03) == 3)\n" "+\t\t\treturn 1;\n" "+\n" "+\t\tmdelay(1);\n" @@ -153,7 +153,7 @@ "+\t\t\tnp_cpu = of_parse_phandle(np_apmu, \"cpus\", bit);\n" "+\t\t\tif (np_cpu) {\n" "+\t\t\t\tif (!of_property_read_u32(np_cpu, \"reg\", &id)) {\n" - "+\t\t\t\t\tif (id = cpu_logical_map(0))\n" + "+\t\t\t\t\tif (id == cpu_logical_map(0))\n" "+\t\t\t\t\t\tis_allowed = true;\n" "+\t\t\t\t}\n" "+\t\t\t\tof_node_put(np_cpu);\n" @@ -247,4 +247,4 @@ "+}\n" +#endif -759277951fddb73fd6f4b3ccf5fd84310cc0e9164a60d9bc470b94b5e3ced349 +e70ca02646d98c94f06cdc95ec1f52130bcf40c1da0b031e4ac3301958bc7fb3
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.