diff for duplicates of <20100902162124.GN11597@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 54730f9..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,42 +1 @@ ->From f80d3cc85327ba84748646bb44a0c45103ef66bc Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Wed, 1 Sep 2010 20:40:47 -0700 -Subject: [PATCH 4/6] ARM: Do not call test_for_ipi or test_for_ltrirq on UP systems -Do not call test_for_ipi or test_for_ltrirq on UP systems. - -Note that we can't put test_for_ltriq into SMP statement as -it's inlined into the code and the remaining lines of the -macro would still run before UP macro line. - -Signed-off-by: Tony Lindgren <tony@atomide.com> ---- - arch/arm/kernel/entry-armv.S | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S -index bb2ef60..b8c1ec7 100644 ---- a/arch/arm/kernel/entry-armv.S -+++ b/arch/arm/kernel/entry-armv.S -@@ -40,6 +40,11 @@ - bne asm_do_IRQ - - #ifdef CONFIG_SMP -+#ifdef CONFIG_SMP_ON_UP -+ adr lr, BSYM(2f) @ set lr to end of macro for early return -+ SMP(nop) @ continue on SMP hardware -+ UP(mov pc, lr) @ return early on UP -+#endif - /* - * XXX - * -@@ -57,6 +62,7 @@ - adrne lr, BSYM(1b) - bne do_local_timer - #endif -+2: - #endif - - .endm --- -1.7.1 diff --git a/a/content_digest b/N1/content_digest index 134255d..7f3f8ba 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,57 +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 4/6] ARM: Do not call test_for_ipi or test_for_ltrirq on UP systems\0" "Date\0Thu, 2 Sep 2010 09:21:24 -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 f80d3cc85327ba84748646bb44a0c45103ef66bc Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Wed, 1 Sep 2010 20:40:47 -0700\n" - "Subject: [PATCH 4/6] ARM: Do not call test_for_ipi or test_for_ltrirq on UP systems\n" - "\n" - "Do not call test_for_ipi or test_for_ltrirq on UP systems.\n" - "\n" - "Note that we can't put test_for_ltriq into SMP statement as\n" - "it's inlined into the code and the remaining lines of the\n" - "macro would still run before UP macro line.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "---\n" - " arch/arm/kernel/entry-armv.S | 6 ++++++\n" - " 1 files changed, 6 insertions(+), 0 deletions(-)\n" - "\n" - "diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S\n" - "index bb2ef60..b8c1ec7 100644\n" - "--- a/arch/arm/kernel/entry-armv.S\n" - "+++ b/arch/arm/kernel/entry-armv.S\n" - "@@ -40,6 +40,11 @@\n" - " \tbne\tasm_do_IRQ\n" - " \n" - " #ifdef CONFIG_SMP\n" - "+#ifdef CONFIG_SMP_ON_UP\n" - "+\tadr\tlr, BSYM(2f)\t@ set lr to end of macro for early return\n" - "+\tSMP(nop)\t\t@ continue on SMP hardware\n" - "+\tUP(mov\tpc, lr)\t\t@ return early on UP\n" - "+#endif\n" - " \t/*\n" - " \t * XXX\n" - " \t *\n" - "@@ -57,6 +62,7 @@\n" - " \tadrne\tlr, BSYM(1b)\n" - " \tbne\tdo_local_timer\n" - " #endif\n" - "+2:\n" - " #endif\n" - " \n" - " \t.endm\n" - "-- \n" - 1.7.1 -be451a5364d73a0d30d647f3b4589ebbec8f2ac9a47c0aa41c22946271c2ddfa +4c3305dd46987023f2c6a1e128ebe1ea5e0f7438bb995d964fd6464f127cb5dc
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.