diff for duplicates of <20100902162220.GO11597@atomide.com> diff --git a/a/1.txt b/N1/1.txt index a29e454..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,29 +1 @@ ->From 8b22546af2ba9a0d96c2f419bfcec1f3c01a414d Mon Sep 17 00:00:00 2001 -From: Tony Lindgren <tony@atomide.com> -Date: Mon, 30 Aug 2010 14:03:28 -0700 -Subject: [PATCH 5/6] ARM: Don't set TLB ops broadcasting on UP ARMv7 -Don't set TLB ops broadcasting on UP ARMv7. Looks like these bits -are also different on A8 and A9. - -Signed-off-by: Tony Lindgren <tony@atomide.com> ---- - arch/arm/mm/proc-v7.S | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S -index 07fc660..51a063d 100644 ---- a/arch/arm/mm/proc-v7.S -+++ b/arch/arm/mm/proc-v7.S -@@ -191,7 +191,8 @@ __v7_setup: - UP(mov r0, #(1 << 6)) @ fake it for UP - tst r0, #(1 << 6) @ SMP/nAMP mode enabled? - orreq r0, r0, #(1 << 6) | (1 << 0) @ Enable SMP/nAMP mode and -- mcreq p15, 0, r0, c1, c0, 1 @ TLB ops broadcasting -+ SMP(mcreq p15, 0, r0, c1, c0, 1) @ TLB ops broadcasting -+ UP(nop) @ Don't enable on UP - #endif - adr r12, __v7_setup_stack @ the local stack - stmia r12, {r0-r5, r7, r9, r11, lr} --- -1.7.1 diff --git a/a/content_digest b/N1/content_digest index 482c9c8..63388a0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,44 +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 5/6] ARM: Don't set TLB ops broadcasting on UP ARMv7\0" "Date\0Thu, 2 Sep 2010 09:22:20 -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 8b22546af2ba9a0d96c2f419bfcec1f3c01a414d Mon Sep 17 00:00:00 2001\n" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Mon, 30 Aug 2010 14:03:28 -0700\n" - "Subject: [PATCH 5/6] ARM: Don't set TLB ops broadcasting on UP ARMv7\n" - "\n" - "Don't set TLB ops broadcasting on UP ARMv7. Looks like these bits\n" - "are also different on A8 and A9.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "---\n" - " arch/arm/mm/proc-v7.S | 3 ++-\n" - " 1 files changed, 2 insertions(+), 1 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S\n" - "index 07fc660..51a063d 100644\n" - "--- a/arch/arm/mm/proc-v7.S\n" - "+++ b/arch/arm/mm/proc-v7.S\n" - "@@ -191,7 +191,8 @@ __v7_setup:\n" - " \tUP(mov\tr0, #(1 << 6))\t\t\t@ fake it for UP\n" - " \ttst\tr0, #(1 << 6)\t\t\t@ SMP/nAMP mode enabled?\n" - " \torreq\tr0, r0, #(1 << 6) | (1 << 0)\t@ Enable SMP/nAMP mode and\n" - "-\tmcreq\tp15, 0, r0, c1, c0, 1\t\t@ TLB ops broadcasting\n" - "+\tSMP(mcreq\tp15, 0, r0, c1, c0, 1)\t@ TLB ops broadcasting\n" - "+\tUP(nop)\t\t\t\t\t@ Don't enable on UP \n" - " #endif\n" - " \tadr\tr12, __v7_setup_stack\t\t@ the local stack\n" - " \tstmia\tr12, {r0-r5, r7, r9, r11, lr}\n" - "-- \n" - 1.7.1 -165b5cf6ca363dd53282c051c49406672de9e97f83c84a53c9a795e28ef30de9 +6e49331aead422a6eb18a5f853000fd4f56e64aa9c2f3371b8ef6fa364379942
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.