Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[~andy/linux] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index f8f578a71b25c311c31c27989789d5e2fe53f9ef..40b809742a1c3ecf3b42a0e55b8130059d7d6e8e 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -24,7 +24,7 @@ static struct sysdev_class node_class = {
 static ssize_t node_read_cpumap(struct sys_device *dev, int type, char *buf)
 {
        struct node *node_dev = to_node(dev);
-       node_to_cpumask_ptr(mask, node_dev->sysdev.id);
+       const struct cpumask *mask = cpumask_of_node(node_dev->sysdev.id);
        int len;
 
        /* 2008/04/07: buf currently PAGE_SIZE, need 9 chars per 32 bits. */