diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-18 20:42:55 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-18 20:42:55 +0100 |
| commit | b1179ec76b8eb71637339379804a1b69df48d366 (patch) | |
| tree | d8b28acde2a0bef6b572af2cee1f86723894f95a | |
| parent | d078aa7666ea149abbed36ae92ca8cfa75605086 (diff) | |
| download | patches-b1179ec76b8eb71637339379804a1b69df48d366.tar.gz | |
update memory patch to include all architectures
Not compiled, not tested!
| -rw-r--r-- | 10-memory.patch | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/10-memory.patch b/10-memory.patch index fe940bb..b20a2a6 100644 --- a/10-memory.patch +++ b/10-memory.patch @@ -1,7 +1,7 @@ From: Kay Sievers <kay.sievers@vrfy.org> Subject: convert 'memory' sysdev_class to a regular subsystem -This moves the 'cpu sysdev_class' over to a regular 'cpu' subsystem +This moves the 'memory sysdev_class' over to a regular 'memory' subsystem and converts the devices to regular devices. The sysdev drivers are implemented as subsystem interfaces now. @@ -10,15 +10,36 @@ sysdev implementation will be entirely removed from the kernel. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> --- - drivers/base/memory.c | 160 ++++++++++++++++++++----------------------------- - drivers/base/node.c | 146 +++++++++++++++++++++++--------------------- - include/linux/memory.h | 3 - include/linux/node.h | 6 - - mm/compaction.c | 10 +-- - mm/hugetlb.c | 34 +++++----- - mm/vmscan.c | 14 ++-- - 7 files changed, 175 insertions(+), 198 deletions(-) + arch/powerpc/kernel/sysfs.c | 4 - + drivers/base/memory.c | 160 ++++++++++++++++++-------------------------- + drivers/base/node.c | 146 ++++++++++++++++++++-------------------- + include/linux/memory.h | 3 + include/linux/node.h | 6 - + mm/compaction.c | 10 +- + mm/hugetlb.c | 34 ++++----- + mm/vmscan.c | 14 +-- + 8 files changed, 177 insertions(+), 200 deletions(-) +--- a/arch/powerpc/kernel/sysfs.c ++++ b/arch/powerpc/kernel/sysfs.c +@@ -592,7 +592,7 @@ static void register_nodes(void) + int sysfs_add_device_to_node(struct device *dev, int nid) + { + struct node *node = &node_devices[nid]; +- return sysfs_create_link(&node->sysdev.kobj, &dev->kobj, ++ return sysfs_create_link(&node->dev.kobj, &dev->kobj, + kobject_name(&dev->kobj)); + } + EXPORT_SYMBOL_GPL(sysfs_add_device_to_node); +@@ -600,7 +600,7 @@ EXPORT_SYMBOL_GPL(sysfs_add_device_to_no + void sysfs_remove_device_from_node(struct device *dev, int nid) + { + struct node *node = &node_devices[nid]; +- sysfs_remove_link(&node->sysdev.kobj, kobject_name(&dev->kobj)); ++ sysfs_remove_link(&node->dev.kobj, kobject_name(&dev->kobj)); + } + EXPORT_SYMBOL_GPL(sysfs_remove_device_from_node); + --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -1,5 +1,5 @@ |