diff for duplicates of <20100902192659.GW11597@atomide.com> diff --git a/a/1.txt b/N1/1.txt index bc34ff5..486e442 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,3 +41,10 @@ Here's this one updated to replace smp_cpu() instead of smp_on_up(). Tony +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: smp-cpu.patch +Type: text/x-diff +Size: 2042 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100902/d339b7c4/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 4b92f04..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: inline; filename="smp-cpu.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 975fb02..0000000 --- a/a/2.txt +++ /dev/null @@ -1,58 +0,0 @@ -From: Tony Lindgren <tony@atomide.com> -Date: Mon, 30 Aug 2010 14:00:54 -0700 -Subject: [PATCH] ARM: Add inline function smp_cpu() for early init testing - -Add inline function smp_cpu() for early init checks, and -change build_mem_type_table to use it. - -Inline function copied from cpu_is_part_of_mp_system() by -Will Deacon <will.deacon@arm.com>. - -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/include/asm/smp_plat.h b/arch/arm/include/asm/smp_plat.h -index 8db3512..82bc488 100644 ---- a/arch/arm/include/asm/smp_plat.h -+++ b/arch/arm/include/asm/smp_plat.h -@@ -39,4 +39,11 @@ static inline int cache_ops_need_broadcast(void) - #define UP(instr...) _str(instr) - #endif - -+static inline int smp_cpu(void) -+{ -+ u32 mpidr; -+ asm volatile("mrc p15, 0, %0, c0, c0, 5" : "=r" (mpidr)); -+ return (mpidr >> 31) ? !(mpidr >> 30) : 0; -+} -+ - #endif -diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c -index 6e1c4f6..2bfaefd 100644 ---- a/arch/arm/mm/mmu.c -+++ b/arch/arm/mm/mmu.c -@@ -430,15 +430,17 @@ static void __init build_mem_type_table(void) - /* - * Mark memory with the "shared" attribute for SMP systems - */ -- user_pgprot |= L_PTE_SHARED; -- kern_pgprot |= L_PTE_SHARED; -- vecs_pgprot |= L_PTE_SHARED; -- mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_S; -- mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED; -- mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S; -- mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED; -- mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S; -- mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S; -+ if (smp_cpu()) { -+ user_pgprot |= L_PTE_SHARED; -+ kern_pgprot |= L_PTE_SHARED; -+ vecs_pgprot |= L_PTE_SHARED; -+ mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_S; -+ mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED; -+ mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S; -+ mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED; -+ mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S; -+ mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S; -+ } - #endif - } diff --git a/a/content_digest b/N1/content_digest index 0b8e072..7a6be87 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,15 +8,11 @@ "ref\020100902161846.GK11597@atomide.com\0" "ref\020100902170830.GW26319@n2100.arm.linux.org.uk\0" "ref\020100902174244.GU11597@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 1/6] ARM: Add inline function smp_cpu() for early init testing\0" "Date\0Thu, 2 Sep 2010 12:26:59 -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 10:35]:\n" "> * Russell King - ARM Linux <linux@arm.linux.org.uk> [100902 10:00]:\n" @@ -60,67 +56,13 @@ "\n" "Here's this one updated to replace smp_cpu() instead of smp_on_up().\n" "\n" - Tony - "\01:2\0" - "fn\0smp-cpu.patch\0" - "b\0" - "From: Tony Lindgren <tony@atomide.com>\n" - "Date: Mon, 30 Aug 2010 14:00:54 -0700\n" - "Subject: [PATCH] ARM: Add inline function smp_cpu() for early init testing\n" - "\n" - "Add inline function smp_cpu() for early init checks, and\n" - "change build_mem_type_table to use it.\n" - "\n" - "Inline function copied from cpu_is_part_of_mp_system() by\n" - "Will Deacon <will.deacon@arm.com>.\n" - "\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/include/asm/smp_plat.h b/arch/arm/include/asm/smp_plat.h\n" - "index 8db3512..82bc488 100644\n" - "--- a/arch/arm/include/asm/smp_plat.h\n" - "+++ b/arch/arm/include/asm/smp_plat.h\n" - "@@ -39,4 +39,11 @@ static inline int cache_ops_need_broadcast(void)\n" - " #define UP(instr...)\t_str(instr)\n" - " #endif\n" - " \n" - "+static inline int smp_cpu(void)\n" - "+{\n" - "+ u32 mpidr;\n" - "+ asm volatile(\"mrc p15, 0, %0, c0, c0, 5\" : \"=r\" (mpidr));\n" - "+ return (mpidr >> 31) ? !(mpidr >> 30) : 0;\n" - "+}\n" - "+\n" - " #endif\n" - "diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c\n" - "index 6e1c4f6..2bfaefd 100644\n" - "--- a/arch/arm/mm/mmu.c\n" - "+++ b/arch/arm/mm/mmu.c\n" - "@@ -430,15 +430,17 @@ static void __init build_mem_type_table(void)\n" - " \t\t/*\n" - " \t\t * Mark memory with the \"shared\" attribute for SMP systems\n" - " \t\t */\n" - "-\t\tuser_pgprot |= L_PTE_SHARED;\n" - "-\t\tkern_pgprot |= L_PTE_SHARED;\n" - "-\t\tvecs_pgprot |= L_PTE_SHARED;\n" - "-\t\tmem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_S;\n" - "-\t\tmem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;\n" - "-\t\tmem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;\n" - "-\t\tmem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;\n" - "-\t\tmem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;\n" - "-\t\tmem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S;\n" - "+\t\tif (smp_cpu()) {\n" - "+\t\t\tuser_pgprot |= L_PTE_SHARED;\n" - "+\t\t\tkern_pgprot |= L_PTE_SHARED;\n" - "+\t\t\tvecs_pgprot |= L_PTE_SHARED;\n" - "+\t\t\tmem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_S;\n" - "+\t\t\tmem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;\n" - "+\t\t\tmem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;\n" - "+\t\t\tmem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;\n" - "+\t\t\tmem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;\n" - "+\t\t\tmem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S;\n" - "+\t\t}\n" - " #endif\n" - " \t}" + "Tony\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: smp-cpu.patch\n" + "Type: text/x-diff\n" + "Size: 2042 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100902/d339b7c4/attachment.bin> -c3f3189757547010c0f70fdc6a0a579133dab4c1d183763b8ef44c2887c00445 +1ca6abec2d1dba73d61f07c59cbafed9ee0a8354e22aa22ba98d8242692212de
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.