diff for duplicates of <20040609195057.GY1444@holomorphy.com> diff --git a/a/1.txt b/N1/1.txt index 9d89f2f..da4b61b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,8 +12,7 @@ patch, largely centering around cpu_possible_map. Atop irqaction.patch: Index: mm1-2.6.7-rc3/include/asm-alpha/smp.h -=================================================================== ---- mm1-2.6.7-rc3.orig/include/asm-alpha/smp.h 2004-06-07 12:15:11.000000000 -0700 +=================================--- mm1-2.6.7-rc3.orig/include/asm-alpha/smp.h 2004-06-07 12:15:11.000000000 -0700 +++ mm1-2.6.7-rc3/include/asm-alpha/smp.h 2004-06-09 14:19:58.000000000 -0700 @@ -50,9 +50,7 @@ extern int smp_num_cpus; @@ -27,8 +26,7 @@ Index: mm1-2.6.7-rc3/include/asm-alpha/smp.h #else /* CONFIG_SMP */ Index: mm1-2.6.7-rc3/arch/alpha/kernel/irq.c -=================================================================== ---- mm1-2.6.7-rc3.orig/arch/alpha/kernel/irq.c 2004-06-09 13:40:11.000000000 -0700 +=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/irq.c 2004-06-09 13:40:11.000000000 -0700 +++ mm1-2.6.7-rc3/arch/alpha/kernel/irq.c 2004-06-09 14:29:16.000000000 -0700 @@ -227,7 +227,7 @@ #ifdef CONFIG_SMP @@ -43,7 +41,7 @@ Index: mm1-2.6.7-rc3/arch/alpha/kernel/irq.c if (! irq_desc[irq].handler->set_affinity || irq_user_affinity[irq]) return; -- while (((cpu_present_mask >> cpu) & 1) == 0) +- while (((cpu_present_mask >> cpu) & 1) = 0) + while (!cpu_possible(cpu)) cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0); last_cpu = cpu; @@ -117,7 +115,7 @@ Index: mm1-2.6.7-rc3/arch/alpha/kernel/irq.c /* The special value 0 means release control of the affinity to kernel. */ -- if (new_value == 0) { +- if (new_value = 0) { + cpus_and(new_value, new_value, cpu_online_map); + if (cpus_empty(new_value)) { irq_user_affinity[irq] = 0; @@ -146,8 +144,7 @@ Index: mm1-2.6.7-rc3/arch/alpha/kernel/irq.c return err; Index: mm1-2.6.7-rc3/arch/alpha/kernel/process.c -=================================================================== ---- mm1-2.6.7-rc3.orig/arch/alpha/kernel/process.c 2004-06-07 12:14:58.000000000 -0700 +=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/process.c 2004-06-07 12:14:58.000000000 -0700 +++ mm1-2.6.7-rc3/arch/alpha/kernel/process.c 2004-06-09 13:51:37.000000000 -0700 @@ -119,8 +119,8 @@ @@ -161,8 +158,7 @@ Index: mm1-2.6.7-rc3/arch/alpha/kernel/process.c #endif Index: mm1-2.6.7-rc3/arch/alpha/kernel/smp.c -=================================================================== ---- mm1-2.6.7-rc3.orig/arch/alpha/kernel/smp.c 2004-06-07 12:14:02.000000000 -0700 +=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/smp.c 2004-06-07 12:14:02.000000000 -0700 +++ mm1-2.6.7-rc3/arch/alpha/kernel/smp.c 2004-06-09 14:32:40.000000000 -0700 @@ -68,7 +68,7 @@ static int smp_secondary_alive __initdata = 0; @@ -185,14 +181,14 @@ Index: mm1-2.6.7-rc3/arch/alpha/kernel/smp.c @@ -547,7 +547,7 @@ /* Nothing to do on a UP box, or when told not to. */ - if (smp_num_probed == 1 || max_cpus == 0) { + if (smp_num_probed = 1 || max_cpus = 0) { - cpu_present_mask = 1UL << boot_cpuid; + cpu_present_mask = cpumask_of_cpu(boot_cpuid); printk(KERN_INFO "SMP mode deactivated.\n"); return; } @@ -562,7 +562,7 @@ - if (((hwrpb_cpu_present_mask >> i) & 1) == 0) + if (((hwrpb_cpu_present_mask >> i) & 1) = 0) continue; - cpu_present_mask |= 1UL << i; @@ -277,8 +273,7 @@ Index: mm1-2.6.7-rc3/arch/alpha/kernel/smp.c atomic_set(&data.unstarted_count, num_cpus_to_call); atomic_set(&data.unfinished_count, num_cpus_to_call); Index: mm1-2.6.7-rc3/arch/alpha/kernel/setup.c -=================================================================== ---- mm1-2.6.7-rc3.orig/arch/alpha/kernel/setup.c 2004-06-09 13:39:28.000000000 -0700 +=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/setup.c 2004-06-09 13:39:28.000000000 -0700 +++ mm1-2.6.7-rc3/arch/alpha/kernel/setup.c 2004-06-09 14:30:48.000000000 -0700 @@ -1245,9 +1245,9 @@ platform_string(), nr_processors); @@ -293,8 +288,7 @@ Index: mm1-2.6.7-rc3/arch/alpha/kernel/setup.c show_cache_size (f, "L1 Icache", alpha_l1i_cacheshape); Index: mm1-2.6.7-rc3/arch/alpha/kernel/sys_dp264.c -=================================================================== ---- mm1-2.6.7-rc3.orig/arch/alpha/kernel/sys_dp264.c 2004-06-07 12:14:01.000000000 -0700 +=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/sys_dp264.c 2004-06-07 12:14:01.000000000 -0700 +++ mm1-2.6.7-rc3/arch/alpha/kernel/sys_dp264.c 2004-06-09 14:41:07.000000000 -0700 @@ -53,7 +53,6 @@ register int bcpu = boot_cpuid; @@ -308,10 +302,10 @@ Index: mm1-2.6.7-rc3/arch/alpha/kernel/sys_dp264.c dim1 = &cchip->dim1.csr; dim2 = &cchip->dim2.csr; dim3 = &cchip->dim3.csr; -- if ((cpm & 1) == 0) dim0 = &dummy; -- if ((cpm & 2) == 0) dim1 = &dummy; -- if ((cpm & 4) == 0) dim2 = &dummy; -- if ((cpm & 8) == 0) dim3 = &dummy; +- if ((cpm & 1) = 0) dim0 = &dummy; +- if ((cpm & 2) = 0) dim1 = &dummy; +- if ((cpm & 4) = 0) dim2 = &dummy; +- if ((cpm & 8) = 0) dim3 = &dummy; + if (cpu_possible(0)) dim0 = &dummy; + if (cpu_possible(1)) dim1 = &dummy; + if (cpu_possible(2)) dim2 = &dummy; diff --git a/a/content_digest b/N1/content_digest index febd0c4..0a35a11 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020040609175910.GS1444@holomorphy.com\0" "From\0William Lee Irwin III <wli@holomorphy.com>\0" "Subject\0Re: 2.6.7-rc3-mm1\0" - "Date\0Wed, 9 Jun 2004 12:50:57 -0700\0" + "Date\0Wed, 09 Jun 2004 19:50:57 +0000\0" "To\0Andrew Morton <akpm@osdl.org>" linux-kernel@vger.kernel.org " sparclinux@vger.kernel.org\0" @@ -23,8 +23,7 @@ "\n" "\n" "Index: mm1-2.6.7-rc3/include/asm-alpha/smp.h\n" - "===================================================================\n" - "--- mm1-2.6.7-rc3.orig/include/asm-alpha/smp.h\t2004-06-07 12:15:11.000000000 -0700\n" + "=================================--- mm1-2.6.7-rc3.orig/include/asm-alpha/smp.h\t2004-06-07 12:15:11.000000000 -0700\n" "+++ mm1-2.6.7-rc3/include/asm-alpha/smp.h\t2004-06-09 14:19:58.000000000 -0700\n" "@@ -50,9 +50,7 @@\n" " extern int smp_num_cpus;\n" @@ -38,8 +37,7 @@ " #else /* CONFIG_SMP */\n" " \n" "Index: mm1-2.6.7-rc3/arch/alpha/kernel/irq.c\n" - "===================================================================\n" - "--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/irq.c\t2004-06-09 13:40:11.000000000 -0700\n" + "=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/irq.c\t2004-06-09 13:40:11.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/alpha/kernel/irq.c\t2004-06-09 14:29:16.000000000 -0700\n" "@@ -227,7 +227,7 @@\n" " #ifdef CONFIG_SMP \n" @@ -54,7 +52,7 @@ " \tif (! irq_desc[irq].handler->set_affinity || irq_user_affinity[irq])\n" " \t\treturn;\n" " \n" - "-\twhile (((cpu_present_mask >> cpu) & 1) == 0)\n" + "-\twhile (((cpu_present_mask >> cpu) & 1) = 0)\n" "+\twhile (!cpu_possible(cpu))\n" " \t\tcpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);\n" " \tlast_cpu = cpu;\n" @@ -128,7 +126,7 @@ " \n" " \t/* The special value 0 means release control of the\n" " \t affinity to kernel. */\n" - "-\tif (new_value == 0) {\n" + "-\tif (new_value = 0) {\n" "+\tcpus_and(new_value, new_value, cpu_online_map);\n" "+\tif (cpus_empty(new_value)) {\n" " \t\tirq_user_affinity[irq] = 0;\n" @@ -157,8 +155,7 @@ " \t\treturn err;\n" " \n" "Index: mm1-2.6.7-rc3/arch/alpha/kernel/process.c\n" - "===================================================================\n" - "--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/process.c\t2004-06-07 12:14:58.000000000 -0700\n" + "=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/process.c\t2004-06-07 12:14:58.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/alpha/kernel/process.c\t2004-06-09 13:51:37.000000000 -0700\n" "@@ -119,8 +119,8 @@\n" " \n" @@ -172,8 +169,7 @@ " #endif\n" " \n" "Index: mm1-2.6.7-rc3/arch/alpha/kernel/smp.c\n" - "===================================================================\n" - "--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/smp.c\t2004-06-07 12:14:02.000000000 -0700\n" + "=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/smp.c\t2004-06-07 12:14:02.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/alpha/kernel/smp.c\t2004-06-09 14:32:40.000000000 -0700\n" "@@ -68,7 +68,7 @@\n" " static int smp_secondary_alive __initdata = 0;\n" @@ -196,14 +192,14 @@ "@@ -547,7 +547,7 @@\n" " \n" " \t/* Nothing to do on a UP box, or when told not to. */\n" - " \tif (smp_num_probed == 1 || max_cpus == 0) {\n" + " \tif (smp_num_probed = 1 || max_cpus = 0) {\n" "-\t\tcpu_present_mask = 1UL << boot_cpuid;\n" "+\t\tcpu_present_mask = cpumask_of_cpu(boot_cpuid);\n" " \t\tprintk(KERN_INFO \"SMP mode deactivated.\\n\");\n" " \t\treturn;\n" " \t}\n" "@@ -562,7 +562,7 @@\n" - " \t\tif (((hwrpb_cpu_present_mask >> i) & 1) == 0)\n" + " \t\tif (((hwrpb_cpu_present_mask >> i) & 1) = 0)\n" " \t\t\tcontinue;\n" " \n" "-\t\tcpu_present_mask |= 1UL << i;\n" @@ -288,8 +284,7 @@ " \tatomic_set(&data.unstarted_count, num_cpus_to_call);\n" " \tatomic_set(&data.unfinished_count, num_cpus_to_call);\n" "Index: mm1-2.6.7-rc3/arch/alpha/kernel/setup.c\n" - "===================================================================\n" - "--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/setup.c\t2004-06-09 13:39:28.000000000 -0700\n" + "=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/setup.c\t2004-06-09 13:39:28.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/alpha/kernel/setup.c\t2004-06-09 14:30:48.000000000 -0700\n" "@@ -1245,9 +1245,9 @@\n" " \t\t platform_string(), nr_processors);\n" @@ -304,8 +299,7 @@ " \n" " \tshow_cache_size (f, \"L1 Icache\", alpha_l1i_cacheshape);\n" "Index: mm1-2.6.7-rc3/arch/alpha/kernel/sys_dp264.c\n" - "===================================================================\n" - "--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/sys_dp264.c\t2004-06-07 12:14:01.000000000 -0700\n" + "=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/sys_dp264.c\t2004-06-07 12:14:01.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/alpha/kernel/sys_dp264.c\t2004-06-09 14:41:07.000000000 -0700\n" "@@ -53,7 +53,6 @@\n" " \tregister int bcpu = boot_cpuid;\n" @@ -319,10 +313,10 @@ " \tdim1 = &cchip->dim1.csr;\n" " \tdim2 = &cchip->dim2.csr;\n" " \tdim3 = &cchip->dim3.csr;\n" - "-\tif ((cpm & 1) == 0) dim0 = &dummy;\n" - "-\tif ((cpm & 2) == 0) dim1 = &dummy;\n" - "-\tif ((cpm & 4) == 0) dim2 = &dummy;\n" - "-\tif ((cpm & 8) == 0) dim3 = &dummy;\n" + "-\tif ((cpm & 1) = 0) dim0 = &dummy;\n" + "-\tif ((cpm & 2) = 0) dim1 = &dummy;\n" + "-\tif ((cpm & 4) = 0) dim2 = &dummy;\n" + "-\tif ((cpm & 8) = 0) dim3 = &dummy;\n" "+\tif (cpu_possible(0)) dim0 = &dummy;\n" "+\tif (cpu_possible(1)) dim1 = &dummy;\n" "+\tif (cpu_possible(2)) dim2 = &dummy;\n" @@ -365,4 +359,4 @@ " \tspin_lock(&dp264_irq_lock);\n" " \tcpu_set_irq_affinity(irq - 16, affinity);" -23b7b75e137dfbef85e2466a3a14132fe4797562b67c9a75bcbd8c3efae595f2 +c66ddb38228eb05c065df47e792e7c9f7f8fe652171637ee597987f27f33b4c8
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.