From: Andrew Morton <akpm@osdl.org>

Cc: Christoph Hellwig <hch@lst.de>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/device.h |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff -puN include/linux/device.h~add-numa-node-information-to-struct-device-tidy include/linux/device.h
--- a/include/linux/device.h~add-numa-node-information-to-struct-device-tidy
+++ a/include/linux/device.h
@@ -397,11 +397,22 @@ struct device {
 };
 
 #ifdef CONFIG_NUMA
-#define dev_to_node(dev)	((dev)->numa_node)
-#define set_dev_node(dev, node)	((dev)->numa_node = node)
+static inline int dev_to_node(struct device *dev)
+{
+	return dev->numa_node;
+}
+static inline void set_dev_node(struct device *dev, int node)
+{
+	dev->numa_node = node;
+}
 #else
-#define dev_to_node(dev)	(-1)
-#define set_dev_node(dev, node)	do { } while (0)
+static inline int dev_to_node(struct device *dev)
+{
+	return -1;
+}
+static inline void set_dev_node(struct device *dev, int node)
+{
+}
 #endif
 
 static inline void *
_