diff for duplicates of <200710262019.12094.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index 92f1a90..ca3925e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On Friday 26 October 2007, Olof Johansson wrote: -> Fix two build errors on powerpc allyesconfig + CONFIG_SMP=3Dn: +> Fix two build errors on powerpc allyesconfig + CONFIG_SMP=n: > > arch/powerpc/platforms/built-in.o: In function `cpu_affinity_set': > arch/powerpc/platforms/cell/spu_priv1_mmio.c:78: undefined reference to @@ -13,16 +13,15 @@ Thanks for reporting this. > --- a/arch/powerpc/platforms/cell/spu_priv1_mmio.c > +++ b/arch/powerpc/platforms/cell/spu_priv1_mmio.c > @@ -75,9 +75,11 @@ static u64 int_stat_get(struct spu *spu, int class) -> =A0 -> =A0static void cpu_affinity_set(struct spu *spu, int cpu) -> =A0{ +> +> static void cpu_affinity_set(struct spu *spu, int cpu) +> { > +#ifdef CONFIG_SMP -> =A0=A0=A0=A0=A0=A0=A0=A0u64 target =3D iic_get_target_id(cpu); -> =A0=A0=A0=A0=A0=A0=A0=A0u64 route =3D target << 48 | target << 32 | targe= -t << 16; -> =A0=A0=A0=A0=A0=A0=A0=A0out_be64(&spu->priv1->int_route_RW, route); +> u64 target = iic_get_target_id(cpu); +> u64 route = target << 48 | target << 32 | target << 16; +> out_be64(&spu->priv1->int_route_RW, route); > +#endif -> =A0} +> } I think here it would be better to move iic_get_target_id out of CONFIG_SMP as well. We might want to kexec from an SMP kernel into diff --git a/a/content_digest b/N1/content_digest index edb37ef..7c7c6ed 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,7 +9,7 @@ "\00:1\0" "b\0" "On Friday 26 October 2007, Olof Johansson wrote:\n" - "> Fix two build errors on powerpc allyesconfig + CONFIG_SMP=3Dn:\n" + "> Fix two build errors on powerpc allyesconfig + CONFIG_SMP=n:\n" ">\n" "> arch/powerpc/platforms/built-in.o: In function `cpu_affinity_set':\n" "> arch/powerpc/platforms/cell/spu_priv1_mmio.c:78: undefined reference to\n" @@ -23,16 +23,15 @@ "> --- a/arch/powerpc/platforms/cell/spu_priv1_mmio.c\n" "> +++ b/arch/powerpc/platforms/cell/spu_priv1_mmio.c\n" "> @@ -75,9 +75,11 @@ static u64 int_stat_get(struct spu *spu, int class)\n" - "> =A0\n" - "> =A0static void cpu_affinity_set(struct spu *spu, int cpu)\n" - "> =A0{\n" + "> \302\240\n" + "> \302\240static void cpu_affinity_set(struct spu *spu, int cpu)\n" + "> \302\240{\n" "> +#ifdef CONFIG_SMP\n" - "> =A0=A0=A0=A0=A0=A0=A0=A0u64 target =3D iic_get_target_id(cpu);\n" - "> =A0=A0=A0=A0=A0=A0=A0=A0u64 route =3D target << 48 | target << 32 | targe=\n" - "t << 16;\n" - "> =A0=A0=A0=A0=A0=A0=A0=A0out_be64(&spu->priv1->int_route_RW, route);\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240u64 target = iic_get_target_id(cpu);\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240u64 route = target << 48 | target << 32 | target << 16;\n" + "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240out_be64(&spu->priv1->int_route_RW, route);\n" "> +#endif\n" - "> =A0}\n" + "> \302\240}\n" "\n" "I think here it would be better to move iic_get_target_id out of\n" "CONFIG_SMP as well. We might want to kexec from an SMP kernel into\n" @@ -41,4 +40,4 @@ "\n" "\tArnd <><" -63e066070f583e38b4daf36df6edb6614557daaaff71917e99091f7cbd4eb6b4 +5abd7a877c5ebd2d28df016fe407476b1f2d042e632e1962827f03a59a3a671b
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.