diff for duplicates of <20101214075711.11275.31475.sendpatchset@t400s> diff --git a/a/1.txt b/N1/1.txt index caf6d2e..f825690 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,8 @@ Signed-off-by: Magnus Damm <damm@opensource.se> +smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o # Pinmux setup - pfc-y :--- 0007/arch/arm/mach-shmobile/include/mach/common.h + pfc-y := +--- 0007/arch/arm/mach-shmobile/include/mach/common.h +++ work/arch/arm/mach-shmobile/include/mach/common.h 2010-12-14 14:36:41.000000000 +0900 @@ -38,4 +38,9 @@ extern void sh73a0_pinmux_init(void); extern struct clk sh73a0_extal1_clk; @@ -157,7 +158,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + /* enable cache coherency */ + modify_scu_cpu_psr(0, 3 << (cpu * 8)); + -+ if (((__raw_readw(__io(PSTR)) >> (4 * cpu)) & 3) = 3) ++ if (((__raw_readw(__io(PSTR)) >> (4 * cpu)) & 3) == 3) + __raw_writel(1 << cpu, __io(WUPCR)); /* wake up */ + else + __raw_writel(1 << cpu, __io(SRESCR)); /* reset */ diff --git a/a/content_digest b/N1/content_digest index b0c4fb0..d9d7711 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020101214075647.11275.25933.sendpatchset@t400s\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 03/03] ARM: mach-shmobile: sh73a0 SMP support\0" - "Date\0Tue, 14 Dec 2010 07:57:11 +0000\0" + "Date\0Tue, 14 Dec 2010 16:57:11 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -34,7 +34,8 @@ "+smp-$(CONFIG_ARCH_SH73A0)\t+= smp-sh73a0.o\n" " \n" " # Pinmux setup\n" - " pfc-y\t\t\t\t:--- 0007/arch/arm/mach-shmobile/include/mach/common.h\n" + " pfc-y\t\t\t\t:=\n" + "--- 0007/arch/arm/mach-shmobile/include/mach/common.h\n" "+++ work/arch/arm/mach-shmobile/include/mach/common.h\t2010-12-14 14:36:41.000000000 +0900\n" "@@ -38,4 +38,9 @@ extern void sh73a0_pinmux_init(void);\n" " extern struct clk sh73a0_extal1_clk;\n" @@ -164,7 +165,7 @@ "+\t/* enable cache coherency */\n" "+\tmodify_scu_cpu_psr(0, 3 << (cpu * 8));\n" "+\n" - "+\tif (((__raw_readw(__io(PSTR)) >> (4 * cpu)) & 3) = 3)\n" + "+\tif (((__raw_readw(__io(PSTR)) >> (4 * cpu)) & 3) == 3)\n" "+\t\t__raw_writel(1 << cpu, __io(WUPCR));\t/* wake up */\n" "+\telse\n" "+\t\t__raw_writel(1 << cpu, __io(SRESCR));\t/* reset */\n" @@ -189,4 +190,4 @@ "+}\n" + -03e058abe491348869b171eb24ee85709be31b5bbd19572f009c1560f7bd0cb1 +2fec9222fb33e737ec6a4a4cb176201ca6f478b58866116416b02bccaf52f927
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.