diff for duplicates of <20120103093123.GA7620@8bytes.org> diff --git a/a/1.txt b/N1/1.txt index 986acb7..def7429 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,15 +1,15 @@ On Tue, Jan 03, 2012 at 08:44:01AM +0800, Yang Bai wrote: > On Tue, Jan 3, 2012 at 12:33 AM, Joerg Roedel <joerg.roedel@amd.com> wrote: -> > ? ? ? ? ? ? ? ?for_each_possible_cpu(cpu) { -> > - ? ? ? ? ? ? ? ? ? ? ? unsigned long offset = percpu_offset * cpu_logical_map(cpu); -> > + ? ? ? ? ? ? ? ? ? ? ? unsigned long offset = percpu_offset; +> > for_each_possible_cpu(cpu) { +> > - unsigned long offset = percpu_offset * cpu_logical_map(cpu); +> > + unsigned long offset = percpu_offset; > > +#ifdef CONFIG_SMP -> > + ? ? ? ? ? ? ? ? ? ? ? offset *= cpu_logical_map(cpu); +> > + offset *= cpu_logical_map(cpu); > > +#endif -> > ? ? ? ? ? ? ? ? ? ? ? ?*per_cpu_ptr(gic->dist_base.percpu_base, cpu) = dist_base + offset; -> > ? ? ? ? ? ? ? ? ? ? ? ?*per_cpu_ptr(gic->cpu_base.percpu_base, cpu) = cpu_base + offset; -> > ? ? ? ? ? ? ? ?} +> > *per_cpu_ptr(gic->dist_base.percpu_base, cpu) = dist_base + offset; +> > *per_cpu_ptr(gic->cpu_base.percpu_base, cpu) = cpu_base + offset; +> > } > > -- > > 1.7.5.4 > > diff --git a/a/content_digest b/N1/content_digest index 56ac319..564d548 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,31 @@ "ref\01325521990-4445-1-git-send-email-joerg.roedel@amd.com\0" "ref\0CAO_0yfOzVCK8OGL5G9Aej+V4AZ12EMFKi3HafAX0JzeW9C3FtQ@mail.gmail.com\0" - "From\0joro@8bytes.org (Joerg Roedel)\0" - "Subject\0[PATCH] arm: Fix linux-next compile error in arch/arm/common/gic.c\0" + "From\0Joerg Roedel <joro@8bytes.org>\0" + "Subject\0Re: [PATCH] arm: Fix linux-next compile error in arch/arm/common/gic.c\0" "Date\0Tue, 3 Jan 2012 10:31:23 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Yang Bai <hamo.by@gmail.com>\0" + "Cc\0Joerg Roedel <joerg.roedel@amd.com>" + Russell King <linux@arm.linux.org.uk> + Marc Zyngier <marc.zyngier@arm.com> + Thomas Gleixner <tglx@linutronix.de> + Santosh Shilimkar <santosh.shilimkar@ti.com> + Rob Herring <rob.herring@calxeda.com> + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, Jan 03, 2012 at 08:44:01AM +0800, Yang Bai wrote:\n" "> On Tue, Jan 3, 2012 at 12:33 AM, Joerg Roedel <joerg.roedel@amd.com> wrote:\n" "\n" - "> > ? ? ? ? ? ? ? ?for_each_possible_cpu(cpu) {\n" - "> > - ? ? ? ? ? ? ? ? ? ? ? unsigned long offset = percpu_offset * cpu_logical_map(cpu);\n" - "> > + ? ? ? ? ? ? ? ? ? ? ? unsigned long offset = percpu_offset;\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240for_each_possible_cpu(cpu) {\n" + "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 unsigned long offset = percpu_offset * cpu_logical_map(cpu);\n" + "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 unsigned long offset = percpu_offset;\n" "> > +#ifdef CONFIG_SMP\n" - "> > + ? ? ? ? ? ? ? ? ? ? ? offset *= cpu_logical_map(cpu);\n" + "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 offset *= cpu_logical_map(cpu);\n" "> > +#endif\n" - "> > ? ? ? ? ? ? ? ? ? ? ? ?*per_cpu_ptr(gic->dist_base.percpu_base, cpu) = dist_base + offset;\n" - "> > ? ? ? ? ? ? ? ? ? ? ? ?*per_cpu_ptr(gic->cpu_base.percpu_base, cpu) = cpu_base + offset;\n" - "> > ? ? ? ? ? ? ? ?}\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240*per_cpu_ptr(gic->dist_base.percpu_base, cpu) = dist_base + offset;\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240*per_cpu_ptr(gic->cpu_base.percpu_base, cpu) = cpu_base + offset;\n" + "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240}\n" "> > --\n" "> > 1.7.5.4\n" "> >\n" @@ -40,4 +48,4 @@ "\n" "\tJoerg" -6ad85fea5abcaeb3ced8a8312a19239c1f56b99343cdbebb5ecff0cd57682ac5 +360859bda13f6fd0b3dbc0b7b4ecc1badc955eb7634d8cb392189570fd7da58c
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.