From 7e2e08f288a2a498404fc865370fcaac2c942e19 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Fri, 23 Jul 2010 20:11:18 -0600
Subject: [PATCH] --- yaml --- r: 204943 b: refs/heads/master c:
 559e2b7ee7a1c7753d534abcb2742a4775339293 h: refs/heads/master i:   204941:
 e858204e9b7c0b96b891e4653b9b2c649b746a64   204939:
 5df763804fc19a4f8d7bf94153a74b2a4dabc0f0   204935:
 a33d339eb9163a084f5388645d6dbc2c878f6241   204927:
 c0379c051fa78d3b4ca6f9edde2d7011390f3a86 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/microblaze/include/asm/topology.h | 10 ----------
 trunk/arch/powerpc/include/asm/prom.h        |  7 +++++++
 trunk/arch/powerpc/include/asm/topology.h    |  7 -------
 trunk/arch/sparc/include/asm/prom.h          |  3 +--
 trunk/include/linux/of.h                     |  5 +++++
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 6ac539535bfe..55e35ce02f55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6601225380088018ae93df2ba7f0bb65334d63b
+refs/heads/master: 559e2b7ee7a1c7753d534abcb2742a4775339293
diff --git a/trunk/arch/microblaze/include/asm/topology.h b/trunk/arch/microblaze/include/asm/topology.h
index 96bcea5a9920..5428f333a02c 100644
--- a/trunk/arch/microblaze/include/asm/topology.h
+++ b/trunk/arch/microblaze/include/asm/topology.h
@@ -1,11 +1 @@
 #include <asm-generic/topology.h>
-
-#ifndef _ASM_MICROBLAZE_TOPOLOGY_H
-#define _ASM_MICROBLAZE_TOPOLOGY_H
-
-struct device_node;
-static inline int of_node_to_nid(struct device_node *device)
-{
-	return 0;
-}
-#endif /* _ASM_MICROBLAZE_TOPOLOGY_H */
diff --git a/trunk/arch/powerpc/include/asm/prom.h b/trunk/arch/powerpc/include/asm/prom.h
index da7dd634e7ce..55bccc0a21c3 100644
--- a/trunk/arch/powerpc/include/asm/prom.h
+++ b/trunk/arch/powerpc/include/asm/prom.h
@@ -103,6 +103,13 @@ struct device_node *of_find_next_cache_node(struct device_node *np);
 /* Get the MAC address */
 extern const void *of_get_mac_address(struct device_node *np);
 
+#ifdef CONFIG_NUMA
+extern int of_node_to_nid(struct device_node *device);
+#else
+static inline int of_node_to_nid(struct device_node *device) { return 0; }
+#endif
+#define of_node_to_nid of_node_to_nid
+
 /**
  * of_irq_map_pci - Resolve the interrupt for a PCI device
  * @pdev:	the device whose interrupt is to be resolved
diff --git a/trunk/arch/powerpc/include/asm/topology.h b/trunk/arch/powerpc/include/asm/topology.h
index 32adf7280720..09dd38c8882c 100644
--- a/trunk/arch/powerpc/include/asm/topology.h
+++ b/trunk/arch/powerpc/include/asm/topology.h
@@ -41,8 +41,6 @@ static inline int cpu_to_node(int cpu)
 			       cpu_all_mask :				\
 			       node_to_cpumask_map[node])
 
-int of_node_to_nid(struct device_node *device);
-
 struct pci_bus;
 #ifdef CONFIG_PCI
 extern int pcibus_to_node(struct pci_bus *bus);
@@ -94,11 +92,6 @@ extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid);
 
 #else
 
-static inline int of_node_to_nid(struct device_node *device)
-{
-	return 0;
-}
-
 static inline void dump_numa_cpu_topology(void) {}
 
 static inline int sysfs_add_device_to_node(struct sys_device *dev, int nid)
diff --git a/trunk/arch/sparc/include/asm/prom.h b/trunk/arch/sparc/include/asm/prom.h
index c82a7da25f9f..291f12575edd 100644
--- a/trunk/arch/sparc/include/asm/prom.h
+++ b/trunk/arch/sparc/include/asm/prom.h
@@ -43,8 +43,7 @@ extern int of_getintprop_default(struct device_node *np,
 extern int of_find_in_proplist(const char *list, const char *match, int len);
 #ifdef CONFIG_NUMA
 extern int of_node_to_nid(struct device_node *dp);
-#else
-#define of_node_to_nid(dp)	(-1)
+#define of_node_to_nid of_node_to_nid
 #endif
 
 extern void prom_build_devicetree(void);
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
index b0756f33249e..cad7cf0ab278 100644
--- a/trunk/include/linux/of.h
+++ b/trunk/include/linux/of.h
@@ -146,6 +146,11 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
 
 #define OF_BAD_ADDR	((u64)-1)
 
+#ifndef of_node_to_nid
+static inline int of_node_to_nid(struct device_node *np) { return -1; }
+#define of_node_to_nid of_node_to_nid
+#endif
+
 extern struct device_node *of_find_node_by_name(struct device_node *from,
 	const char *name);
 #define for_each_node_by_name(dn, name) \