diff for duplicates of <20100902162337.GP11597@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 44f7585..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,72 +1 @@ ->From c04a57fc3b41d886f56ccdc27cf9758de0c95202 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Tue, 17 Aug 2010 13:33:23 +0300 -Subject: [PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap -Fix SMP on UP interrupt handling for multi-omap - -Signed-off-by: Tony Lindgren <tony@atomide.com> ---- - arch/arm/mach-omap2/omap-smp.c | 13 +++++++++---- - arch/arm/mach-omap2/timer-gp.c | 7 +++++-- - 2 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c -index 9e9f70e..a8bb49c 100644 ---- a/arch/arm/mach-omap2/omap-smp.c -+++ b/arch/arm/mach-omap2/omap-smp.c -@@ -22,6 +22,7 @@ - - #include <asm/cacheflush.h> - #include <asm/localtimer.h> -+#include <asm/smp_plat.h> - #include <asm/smp_scu.h> - #include <mach/hardware.h> - #include <mach/omap4-common.h> -@@ -114,11 +115,15 @@ void __init smp_init_cpus(void) - { - unsigned int i, ncores; - -- /* Never released */ -- scu_base = ioremap(OMAP44XX_SCU_BASE, SZ_256); -- BUG_ON(!scu_base); -+ if (smp_on_up()) { -+ ncores = 1; -+ } else { -+ /* Never released */ -+ scu_base = ioremap(OMAP44XX_SCU_BASE, SZ_256); -+ BUG_ON(!scu_base); - -- ncores = get_core_count(); -+ ncores = get_core_count(); -+ } - - for (i = 0; i < ncores; i++) - set_cpu_possible(i, true); -diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c -index 74fbed8..badf5f2 100644 ---- a/arch/arm/mach-omap2/timer-gp.c -+++ b/arch/arm/mach-omap2/timer-gp.c -@@ -37,6 +37,7 @@ - #include <linux/clockchips.h> - - #include <asm/mach/time.h> -+#include <asm/smp_plat.h> - #include <plat/dmtimer.h> - #include <asm/localtimer.h> - -@@ -228,8 +229,10 @@ static void __init omap2_gp_clocksource_init(void) - static void __init omap2_gp_timer_init(void) - { - #ifdef CONFIG_LOCAL_TIMERS -- twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256); -- BUG_ON(!twd_base); -+ if (smp_on_up()) { -+ twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256); -+ BUG_ON(!twd_base); -+ } - #endif - omap_dm_timer_init(); - --- -1.7.1 diff --git a/a/content_digest b/N1/content_digest index 8a01223..6acd94a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,87 +8,11 @@ "ref\020100830225527.GC11597@atomide.com\0" "ref\020100902133637.GJ26319@n2100.arm.linux.org.uk\0" "ref\020100902161659.GJ11597@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap\0" "Date\0Thu, 2 Sep 2010 09:23:37 -0700\0" - "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - Bryan Wu <bryan.wu@canonical.com> - " Will Deacon <will.deacon@arm.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - ">From c04a57fc3b41d886f56ccdc27cf9758de0c95202 Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Tue, 17 Aug 2010 13:33:23 +0300\n" - "Subject: [PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap\n" - "\n" - "Fix SMP on UP interrupt handling for multi-omap\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "---\n" - " arch/arm/mach-omap2/omap-smp.c | 13 +++++++++----\n" - " arch/arm/mach-omap2/timer-gp.c | 7 +++++--\n" - " 2 files changed, 14 insertions(+), 6 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c\n" - "index 9e9f70e..a8bb49c 100644\n" - "--- a/arch/arm/mach-omap2/omap-smp.c\n" - "+++ b/arch/arm/mach-omap2/omap-smp.c\n" - "@@ -22,6 +22,7 @@\n" - " \n" - " #include <asm/cacheflush.h>\n" - " #include <asm/localtimer.h>\n" - "+#include <asm/smp_plat.h>\n" - " #include <asm/smp_scu.h>\n" - " #include <mach/hardware.h>\n" - " #include <mach/omap4-common.h>\n" - "@@ -114,11 +115,15 @@ void __init smp_init_cpus(void)\n" - " {\n" - " \tunsigned int i, ncores;\n" - " \n" - "-\t/* Never released */\n" - "-\tscu_base = ioremap(OMAP44XX_SCU_BASE, SZ_256);\n" - "-\tBUG_ON(!scu_base);\n" - "+\tif (smp_on_up()) {\n" - "+\t\tncores = 1;\n" - "+\t} else {\n" - "+\t\t/* Never released */\n" - "+\t\tscu_base = ioremap(OMAP44XX_SCU_BASE, SZ_256);\n" - "+\t\tBUG_ON(!scu_base);\n" - " \n" - "-\tncores = get_core_count();\n" - "+\t\tncores = get_core_count();\n" - "+\t}\n" - " \n" - " \tfor (i = 0; i < ncores; i++)\n" - " \t\tset_cpu_possible(i, true);\n" - "diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c\n" - "index 74fbed8..badf5f2 100644\n" - "--- a/arch/arm/mach-omap2/timer-gp.c\n" - "+++ b/arch/arm/mach-omap2/timer-gp.c\n" - "@@ -37,6 +37,7 @@\n" - " #include <linux/clockchips.h>\n" - " \n" - " #include <asm/mach/time.h>\n" - "+#include <asm/smp_plat.h>\n" - " #include <plat/dmtimer.h>\n" - " #include <asm/localtimer.h>\n" - " \n" - "@@ -228,8 +229,10 @@ static void __init omap2_gp_clocksource_init(void)\n" - " static void __init omap2_gp_timer_init(void)\n" - " {\n" - " #ifdef CONFIG_LOCAL_TIMERS\n" - "-\ttwd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256);\n" - "-\tBUG_ON(!twd_base);\n" - "+\tif (smp_on_up()) {\n" - "+\t\ttwd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256);\n" - "+\t\tBUG_ON(!twd_base);\n" - "+\t}\n" - " #endif\n" - " \tomap_dm_timer_init();\n" - " \n" - "-- \n" - 1.7.1 -3df92b92891667d4edea207493740013770e5cbf83a37ed54007c2e2778901fd +8b12754767f28165aa42ba5d0c185e71a332a9408849fc2291d9dd41d4c6dc7b
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.