of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 15 Oct 2009 16:57:51 +0000 (10:57 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 15 Oct 2009 16:57:51 +0000 (10:57 -0600)
Merge of common code duplicated between Sparc, PowerPC and Microblaze

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
arch/sparc/include/asm/prom.h
include/linux/of.h

index e5f4a1d..ddbd870 100644 (file)
@@ -34,9 +34,6 @@ struct of_irq_controller {
        void            *data;
 };
 
-#define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)
-#define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)
-
 extern struct device_node *of_find_node_by_cpuid(int cpuid);
 extern int of_set_property(struct device_node *node, const char *name, void *val, int len);
 extern struct mutex of_set_property_mutex;
index 65a158d..a66c1eb 100644 (file)
@@ -69,6 +69,9 @@ struct device_node {
 #define OF_DYNAMIC     1 /* node and properties were allocated via kmalloc */
 #define OF_DETACHED    2 /* node has been detached from the device tree */
 
+#define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)
+#define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)
+
 #define OF_BAD_ADDR    ((u64)-1)
 
 extern struct device_node *of_find_node_by_name(struct device_node *from,