diff for duplicates of <20100902193000.GX11597@atomide.com> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 4933195..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="smp-on-up-omap.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 6ba237d..0000000 --- a/a/2.txt +++ /dev/null @@ -1,65 +0,0 @@ ->From e791c682fe2e3989e76f0bce7e0c9d97e65c2137 Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Tue, 17 Aug 2010 13:33:23 +0300 -Subject: [PATCH] omap: Fix SMP on UP initialization for multi-omap - -Fix SMP on UP initialization for multi-omap. - -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c -index 9e9f70e..3695232 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_cpu()) { -+ 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..a21b4a4 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_cpu()) { -+ twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256); -+ BUG_ON(!twd_base); -+ } - #endif - omap_dm_timer_init(); diff --git a/a/content_digest b/N1/content_digest index c8dba06..48b6465 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,15 +8,11 @@ "ref\020100902133637.GJ26319@n2100.arm.linux.org.uk\0" "ref\020100902161659.GJ11597@atomide.com\0" "ref\020100902162337.GP11597@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 6/6] omap: Fix SMP on UP interrupt handling for multi-omap\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 12:30:01 -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" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "* Tony Lindgren <tony@atomide.com> [100902 09:16]:\n" "> From c04a57fc3b41d886f56ccdc27cf9758de0c95202 Mon Sep 17 00:00:00 2001\n" @@ -30,73 +26,5 @@ "Looks like the description and subject needed some refreshing too.\n" "\n" Tony - "\01:2\0" - "fn\0smp-on-up-omap.patch\0" - "b\0" - ">From e791c682fe2e3989e76f0bce7e0c9d97e65c2137 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] omap: Fix SMP on UP initialization for multi-omap\n" - "\n" - "Fix SMP on UP initialization for multi-omap.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c\n" - "index 9e9f70e..3695232 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_cpu()) {\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..a21b4a4 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_cpu()) {\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();" -25cd86ce5d1341880be7947ce6ee7503883c6a8d3dd9b3eeabcfe1c76e21ea0a +b9a54f72c40adec83d11b8d2da903f1832ac205547fa1bf6308254e787938cea
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.