diff for duplicates of <20070828162011.5356afaa@localhost> diff --git a/a/1.txt b/N1/1.txt index ed10d98..aa45fe3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,9 +25,7 @@ unit-id or reg do not contain the id. Signed-off-by: Christian Krafft <krafft@de.ibm.com> Index: linux/arch/powerpc/platforms/cell/spu_manage.c -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=================================================================== --- linux.orig/arch/powerpc/platforms/cell/spu_manage.c +++ linux/arch/powerpc/platforms/cell/spu_manage.c @@ -48,10 +48,18 @@ static u64 __init find_spu_unit_number(s @@ -36,26 +34,26 @@ Index: linux/arch/powerpc/platforms/cell/spu_manage.c int proplen; + + /* new device trees should provide the physical-id attribute */ - prop =3D of_get_property(spe, "physical-id", &proplen); - if (proplen =3D=3D 4) + prop = of_get_property(spe, "physical-id", &proplen); + if (proplen == 4) return (u64)*prop; -=20 + + /* celleb device tree provides the unit-id */ -+ prop =3D of_get_property(spe, "unit-id", &proplen); -+ if (proplen =3D=3D 4) ++ prop = of_get_property(spe, "unit-id", &proplen); ++ if (proplen == 4) + return (u64)*prop; + + /* legacy device trees provide the id in the reg attribute */ - prop =3D of_get_property(spe, "reg", &proplen); - if (proplen =3D=3D 4) + prop = of_get_property(spe, "reg", &proplen); + if (proplen == 4) return (u64)*prop; ---=20 -Mit freundlichen Gr=FCssen, +-- +Mit freundlichen Grüssen, kind regards, Christian Krafft -IBM Systems & Technology Group,=20 +IBM Systems & Technology Group, Linux Kernel Development IT Specialist diff --git a/a/content_digest b/N1/content_digest index 881e920..fea28b6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,11 +4,12 @@ "Subject\0Re: [Cbe-oss-dev] [patch 1/5] spu_manage: use newer physical-id\0" "Date\0Tue, 28 Aug 2007 16:20:11 +0200\0" "To\0Arnd Bergmann <arnd@arndb.de>\0" - "Cc\0linux-kernel@vger.kernel.org" + "Cc\0kou.ishizaki@toshiba.co.jp" linuxppc-dev@ozlabs.org + linux-kernel@vger.kernel.org + cbe-oss-dev@ozlabs.org jk@ozlabs.org - krafft@de.ibm.com - " cbe-oss-dev@ozlabs.org\0" + " krafft@de.ibm.com\0" "\00:1\0" "b\0" "On Thu, 23 Aug 2007 18:12:19 +0200\n" @@ -38,9 +39,7 @@ "Signed-off-by: Christian Krafft <krafft@de.ibm.com>\n" "\n" "Index: linux/arch/powerpc/platforms/cell/spu_manage.c\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "===================================================================\n" "--- linux.orig/arch/powerpc/platforms/cell/spu_manage.c\n" "+++ linux/arch/powerpc/platforms/cell/spu_manage.c\n" "@@ -48,10 +48,18 @@ static u64 __init find_spu_unit_number(s\n" @@ -49,28 +48,28 @@ " \tint proplen;\n" "+\n" "+\t/* new device trees should provide the physical-id attribute */\n" - " \tprop =3D of_get_property(spe, \"physical-id\", &proplen);\n" - " \tif (proplen =3D=3D 4)\n" + " \tprop = of_get_property(spe, \"physical-id\", &proplen);\n" + " \tif (proplen == 4)\n" " \t\treturn (u64)*prop;\n" - "=20\n" + " \n" "+\t/* celleb device tree provides the unit-id */\n" - "+\tprop =3D of_get_property(spe, \"unit-id\", &proplen);\n" - "+\tif (proplen =3D=3D 4)\n" + "+\tprop = of_get_property(spe, \"unit-id\", &proplen);\n" + "+\tif (proplen == 4)\n" "+\t\treturn (u64)*prop;\n" "+\n" "+\t/* legacy device trees provide the id in the reg attribute */\n" - " \tprop =3D of_get_property(spe, \"reg\", &proplen);\n" - " \tif (proplen =3D=3D 4)\n" + " \tprop = of_get_property(spe, \"reg\", &proplen);\n" + " \tif (proplen == 4)\n" " \t\treturn (u64)*prop;\n" "\n" "\n" - "--=20\n" - "Mit freundlichen Gr=FCssen,\n" + "-- \n" + "Mit freundlichen Gr\303\274ssen,\n" "kind regards,\n" "\n" "Christian Krafft\n" - "IBM Systems & Technology Group,=20\n" + "IBM Systems & Technology Group, \n" "Linux Kernel Development\n" IT Specialist -ce8285f5009b723cc3012a1d5973f8ebf751334827c3ce3fbdae2eab4f60353b +1604747d3c5454fb189b638c9651164c3914d54bd57b7fd820ebf1266c96bd6a
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.