On Sat, 07 May 2005 19:26:48 -0500 Nathan Lynch wrote:
> > This adds a generic function 'unregister_node()'.
> > It is used to remove objects of a node going away
> > for hotplug.
> >
> > Signed-off-by: Keiichiro Tokunaga <[email protected]>
> > ---
> >
> > linux-2.6.12-rc3-mm3-kei/drivers/base/node.c | 15 +++++++++++++--
> > linux-2.6.12-rc3-mm3-kei/include/linux/node.h | 1 +
> > 2 files changed, 14 insertions(+), 2 deletions(-)
> >
> > diff -puN drivers/base/node.c~numa_hp_base drivers/base/node.c
> > --- linux-2.6.12-rc3-mm3/drivers/base/node.c~numa_hp_base 2005-05-07 19:58:15.000000000 +0900
> > +++ linux-2.6.12-rc3-mm3-kei/drivers/base/node.c 2005-05-07 19:58:15.000000000 +0900
> > @@ -136,7 +136,7 @@ static SYSDEV_ATTR(distance, S_IRUGO, no
> > *
> > * Initialize and register the node device.
> > */
> > -int __init register_node(struct node *node, int num, struct node *parent)
> > +int register_node(struct node *node, int num, struct node *parent)
> > {
> > int error;
> >
> > @@ -153,8 +153,19 @@ int __init register_node(struct node *no
> > return error;
> > }
> >
> > +void unregister_node(struct node *node)
> > +{
> > + sysdev_remove_file(&node->sysdev, &attr_cpumap);
> > + sysdev_remove_file(&node->sysdev, &attr_meminfo);
> > + sysdev_remove_file(&node->sysdev, &attr_numastat);
> > + sysdev_remove_file(&node->sysdev, &attr_distance);
> > +
> > + sysdev_unregister(&node->sysdev);
> > +}
>
> Is it a bug to call unregister_node() if there are still cpus or
> memory present in the node? Note that register_cpu() creates a
> symlink under the node directory to the cpu -- are you assuming that
> all the node's cpu sysdevs will have been unregistered by the time
> unregister_node is called? If so, is it possible to enforce that, or
> at least document it?
Yes, this code is assuming that. I will document it in
a function description of unregister_node().
> > +EXPORT_SYMBOL_GPL(register_node);
> > +EXPORT_SYMBOL_GPL(unregister_node);
>
> What module code needs to call these? ACPI?
Nobody today. I thought it was necessary for my another
patch to support node hotplug, but I found out it's not.
My mistake... I will remove them.
I'm attaching an updated patch.
Thanks,
Keiichiro Tokunaga
This adds a generic function 'unregister_node()'.
It is used to remove objects of a node going away
for hotplug. All the devices on the node must be
unregistered before calling this function.
Signed-off-by: Keiichiro Tokunaga <[email protected]>
---
linux-2.6.12-rc3-mm3-kei/drivers/base/node.c | 20 ++++++++++++++++++--
linux-2.6.12-rc3-mm3-kei/include/linux/node.h | 1 +
2 files changed, 19 insertions(+), 2 deletions(-)
diff -puN drivers/base/node.c~numa_hp_base drivers/base/node.c
--- linux-2.6.12-rc3-mm3/drivers/base/node.c~numa_hp_base 2005-05-07 19:58:15.000000000 +0900
+++ linux-2.6.12-rc3-mm3-kei/drivers/base/node.c 2005-05-08 20:27:32.000000000 +0900
@@ -136,7 +136,7 @@ static SYSDEV_ATTR(distance, S_IRUGO, no
*
* Initialize and register the node device.
*/
-int __init register_node(struct node *node, int num, struct node *parent)
+int register_node(struct node *node, int num, struct node *parent)
{
int error;
@@ -153,8 +153,24 @@ int __init register_node(struct node *no
return error;
}
+/**
+ * unregister_node - unregister a node device
+ * @node: node going away
+ *
+ * Unregisters a node device @node. All the devices on the node must be
+ * unregistered before calling this function.
+ */
+void unregister_node(struct node *node)
+{
+ sysdev_remove_file(&node->sysdev, &attr_cpumap);
+ sysdev_remove_file(&node->sysdev, &attr_meminfo);
+ sysdev_remove_file(&node->sysdev, &attr_numastat);
+ sysdev_remove_file(&node->sysdev, &attr_distance);
+
+ sysdev_unregister(&node->sysdev);
+}
-int __init register_node_type(void)
+static int __init register_node_type(void)
{
return sysdev_class_register(&node_class);
}
diff -puN include/linux/node.h~numa_hp_base include/linux/node.h
--- linux-2.6.12-rc3-mm3/include/linux/node.h~numa_hp_base 2005-05-07 19:58:15.000000000 +0900
+++ linux-2.6.12-rc3-mm3-kei/include/linux/node.h 2005-05-07 19:58:15.000000000 +0900
@@ -27,6 +27,7 @@ struct node {
};
extern int register_node(struct node *, int, struct node *);
+extern void unregister_node(struct node *node);
#define to_node(sys_device) container_of(sys_device, struct node, sysdev)
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
