diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-06-10 18:16:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-06-10 18:16:01 -0700 |
| commit | f5417dc2bb0e9900838c3b7779a77bef7ddba6c1 (patch) | |
| tree | 16484c777022609404257d476f6de685bb8d76fd | |
| parent | 1bca238aef3ab918efefa329aba3f4d1ed93b50a (diff) | |
[driver model] Compile fixes for NUMA
| -rw-r--r-- | drivers/base/memblk.c | 9 | ||||
| -rw-r--r-- | drivers/base/node.c | 15 | ||||
| -rw-r--r-- | include/linux/node.h | 3 |
3 files changed, 9 insertions, 18 deletions
diff --git a/drivers/base/memblk.c b/drivers/base/memblk.c index f3f3fdf7292c..e832cb15839f 100644 --- a/drivers/base/memblk.c +++ b/drivers/base/memblk.c @@ -13,13 +13,6 @@ static struct sysdev_class memblk_class = { set_kset_name("memblk"), }; - -static struct device_driver memblk_driver = { - .name = "memblk", - .bus = &system_bus_type, -}; - - /* * register_memblk - Setup a driverfs device for a MemBlk * @num - MemBlk number to use when creating the device. @@ -37,7 +30,7 @@ int __init register_memblk(struct memblk *memblk, int num, struct node *root) error = sys_device_register(&memblk->sysdev); if (!error) error = sysfs_create_link(&root->sysdev.kobj, - &memblk->sysdev,kobj, + &memblk->sysdev.kobj, memblk->sysdev.kobj.name); return error; } diff --git a/drivers/base/node.c b/drivers/base/node.c index 08e7c52c68e6..76a11b3288fa 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -2,7 +2,7 @@ * drivers/base/node.c - basic Node class support */ -#include <linux/device.h> +#include <linux/sysdev.h> #include <linux/module.h> #include <linux/init.h> #include <linux/mm.h> @@ -14,18 +14,17 @@ static struct sysdev_class node_class = { }; -static ssize_t node_read_cpumap(struct device * dev, char * buf) +static ssize_t node_read_cpumap(struct sys_device * dev, char * buf) { - struct node *node_dev = to_node(to_root(dev)); + struct node *node_dev = to_node(dev); return sprintf(buf,"%lx\n",node_dev->cpumap); } static SYSDEV_ATTR(cpumap,S_IRUGO,node_read_cpumap,NULL); #define K(x) ((x) << (PAGE_SHIFT - 10)) -static ssize_t node_read_meminfo(struct device * dev, char * buf) +static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) { - struct sys_root *node = to_root(dev); - int nid = node->id; + int nid = dev->id; struct sysinfo i; si_meminfo_node(&i, nid); return sprintf(buf, "\n" @@ -64,8 +63,8 @@ int __init register_node(struct node *node, int num, struct node *parent) error = sys_device_register(&node->sysdev); if (!error){ - sys_device_create_file(&node->sysroot.dev, &attr_cpumap); - sys_device_create_file(&node->sysroot.dev, &attr_meminfo); + sysdev_create_file(&node->sysdev, &attr_cpumap); + sysdev_create_file(&node->sysdev, &attr_meminfo); } return error; } diff --git a/include/linux/node.h b/include/linux/node.h index 90543a94b86e..d1c28e6a0b18 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -28,7 +28,6 @@ struct node { extern int register_node(struct node *, int, struct node *); -#define to_node(_root) container_of(_root, struct node, sysroot) -#define to_root(_dev) container_of(_dev, struct sys_root, dev) +#define to_node(sys_device) container_of(sys_device, struct node, sysdev) #endif /* _LINUX_NODE_H_ */ |