diff for duplicates of <20101214075655.11275.95963.sendpatchset@t400s> diff --git a/a/1.txt b/N1/1.txt index e369d6c..9463119 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,7 +42,8 @@ Signed-off-by: Magnus Damm <damm@opensource.se> +smp-$(CONFIG_LOCAL_TIMERS) += localtimer.o + # Pinmux setup - pfc-y : pfc-$(CONFIG_ARCH_SH7367) += pfc-sh7367.o + pfc-y := + pfc-$(CONFIG_ARCH_SH7367) += pfc-sh7367.o @@ -26,4 +31,5 @@ obj-$(CONFIG_MACH_AG5EVM) += board-ag5ev obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o @@ -120,7 +121,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + * we don't allow CPU 0 to be shutdown (it is still too special + * e.g. clock tick interrupts) + */ -+ return cpu = 0 ? -EPERM : 0; ++ return cpu == 0 ? -EPERM : 0; +} --- 0001/arch/arm/mach-shmobile/include/mach/common.h +++ work/arch/arm/mach-shmobile/include/mach/common.h 2010-12-14 13:50:20.000000000 +0900 diff --git a/a/content_digest b/N1/content_digest index 0956311..9d72abd 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 01/03] ARM: mach-shmobile: SMP base support\0" - "Date\0Tue, 14 Dec 2010 07:56:55 +0000\0" + "Date\0Tue, 14 Dec 2010 16:56:55 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -49,7 +49,8 @@ "+smp-$(CONFIG_LOCAL_TIMERS)\t+= localtimer.o\n" "+\n" " # Pinmux setup\n" - " pfc-y\t\t\t\t: pfc-$(CONFIG_ARCH_SH7367)\t+= pfc-sh7367.o\n" + " pfc-y\t\t\t\t:=\n" + " pfc-$(CONFIG_ARCH_SH7367)\t+= pfc-sh7367.o\n" "@@ -26,4 +31,5 @@ obj-$(CONFIG_MACH_AG5EVM)\t+= board-ag5ev\n" " obj-$(CONFIG_MACH_MACKEREL)\t+= board-mackerel.o\n" " \n" @@ -127,7 +128,7 @@ "+\t * we don't allow CPU 0 to be shutdown (it is still too special\n" "+\t * e.g. clock tick interrupts)\n" "+\t */\n" - "+\treturn cpu = 0 ? -EPERM : 0;\n" + "+\treturn cpu == 0 ? -EPERM : 0;\n" "+}\n" "--- 0001/arch/arm/mach-shmobile/include/mach/common.h\n" "+++ work/arch/arm/mach-shmobile/include/mach/common.h\t2010-12-14 13:50:20.000000000 +0900\n" @@ -278,4 +279,4 @@ "+\t}\n" +} -fef337c7e492971607c58cd49895775b1c22fd272a5c0b8c73e0c574e4eea7c2 +89f75db4ce307f188f6c135edd9d208c716994f025f4c4258ea00ae380e04571
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.