From 436dfc9dfd1b66b55f39ef03a6739db307073eec Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jeremy.kerr@canonical.com>
Date: Sat, 30 Jan 2010 01:41:49 -0700
Subject: [PATCH] --- yaml --- r: 180938 b: refs/heads/master c:
 2e89e685a8fd0e8334de967739d11e2e28c1a4dd h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/of/fdt.c       | 4 ++--
 trunk/include/linux/of.h     | 8 +++++---
 trunk/include/linux/of_fdt.h | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8f5840fc708b..1fea287a9408 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36b9d3070d653af5807cef74ff129721d9047107
+refs/heads/master: 2e89e685a8fd0e8334de967739d11e2e28c1a4dd
diff --git a/trunk/drivers/of/fdt.c b/trunk/drivers/of/fdt.c
index 56fbd6e3122a..968a86af5301 100644
--- a/trunk/drivers/of/fdt.c
+++ b/trunk/drivers/of/fdt.c
@@ -431,9 +431,9 @@ int __init early_init_dt_scan_root(unsigned long node, const char *uname,
 	return 1;
 }
 
-u64 __init dt_mem_next_cell(int s, u32 **cellp)
+u64 __init dt_mem_next_cell(int s, __be32 **cellp)
 {
-	u32 *p = *cellp;
+	__be32 *p = *cellp;
 
 	*cellp = p + s;
 	return of_read_number(p, s);
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
index fd47c81d7a25..fa5571b6e219 100644
--- a/trunk/include/linux/of.h
+++ b/trunk/include/linux/of.h
@@ -20,6 +20,8 @@
 #include <linux/kref.h>
 #include <linux/mod_devicetable.h>
 
+#include <asm/byteorder.h>
+
 typedef u32 phandle;
 typedef u32 ihandle;
 
@@ -95,16 +97,16 @@ extern void of_node_put(struct device_node *node);
  */
 
 /* Helper to read a big number; size is in cells (not bytes) */
-static inline u64 of_read_number(const u32 *cell, int size)
+static inline u64 of_read_number(const __be32 *cell, int size)
 {
 	u64 r = 0;
 	while (size--)
-		r = (r << 32) | *(cell++);
+		r = (r << 32) | be32_to_cpu(*(cell++));
 	return r;
 }
 
 /* Like of_read_number, but we want an unsigned long result */
-static inline unsigned long of_read_ulong(const u32 *cell, int size)
+static inline unsigned long of_read_ulong(const __be32 *cell, int size)
 {
 	/* toss away upper bits if unsigned long is smaller than u64 */
 	return of_read_number(cell, size);
diff --git a/trunk/include/linux/of_fdt.h b/trunk/include/linux/of_fdt.h
index f32f0fc5314a..6a35d91a53a6 100644
--- a/trunk/include/linux/of_fdt.h
+++ b/trunk/include/linux/of_fdt.h
@@ -78,7 +78,7 @@ extern void early_init_dt_check_for_initrd(unsigned long node);
 extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
 				     int depth, void *data);
 extern void early_init_dt_add_memory_arch(u64 base, u64 size);
-extern u64 dt_mem_next_cell(int s, u32 **cellp);
+extern u64 dt_mem_next_cell(int s, __be32 **cellp);
 
 /*
  * If BLK_DEV_INITRD, the fdt early init code will call this function,