- cell-allow-linux-to-map-cell-regs-on-legacy-slof-tree.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     cell: allow linux to map Cell regs on legacy SLOF tree.
has been removed from the -mm tree.  Its filename was
     cell-allow-linux-to-map-cell-regs-on-legacy-slof-tree.patch

This patch was dropped because an updated version will be merged

------------------------------------------------------
Subject: cell: allow linux to map Cell regs on legacy SLOF tree.
From: Jean-Christophe DUBOIS <jcd@xxxxxxxxxxxxxxx>

The platforms missing the "cpus" property in the "be" node are mono-Cell
platforms such as CAB or Getaway.

Therefore it is possible to assume that if there is no "cpus" properties under
the "be" node then we can safely return the "device node" without more
checking.  This is a bit hacky but ...  it allows it to work on these
platforms.

Signed-off-by: Jean-Christophe DUBOIS <jcd@xxxxxxxxxxxxxxx>
Acked-by: Christian Krafft <krafft@xxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd.bergmann@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/powerpc/platforms/cell/cbe_regs.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

diff -puN arch/powerpc/platforms/cell/cbe_regs.c~cell-allow-linux-to-map-cell-regs-on-legacy-slof-tree arch/powerpc/platforms/cell/cbe_regs.c
--- a/arch/powerpc/platforms/cell/cbe_regs.c~cell-allow-linux-to-map-cell-regs-on-legacy-slof-tree
+++ a/arch/powerpc/platforms/cell/cbe_regs.c
@@ -174,9 +174,13 @@ static struct device_node *cbe_get_be_no
 
 		cpu_handle = of_get_property(np, "cpus", &len);
 
+		/*
+		 * the CAB SLOF tree is non compliant, so we just assume
+		 * there is only one node
+		 */
 		if (!cpu_handle) {
 			WARN_ON_ONCE(!cpu_handle);
-			continue;
+			return np;
 		}
 
 		for (i=0; i<len; i++)
_

Patches currently in -mm which might be from jcd@xxxxxxxxxxxxxxx are

cell-allow-linux-to-map-cell-regs-on-legacy-slof-tree.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux