diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-06 14:23:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-06 14:23:39 +0200 |
| commit | 68083e05d72d94f347293d8cc0067050ba904bfa (patch) | |
| tree | 842e71365bd90866be7add181661a4039d891564 /drivers/base | |
| parent | cpumask: make for_each_cpu_mask a bit smaller (diff) | |
| parent | Linux 2.6.26-rc9 (diff) | |
| download | linux-68083e05d72d94f347293d8cc0067050ba904bfa.tar.xz linux-68083e05d72d94f347293d8cc0067050ba904bfa.zip | |
Merge commit 'v2.6.26-rc9' into cpus4096
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/core.c | 16 | ||||
| -rw-r--r-- | drivers/base/node.c | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 72eccae4904b..ee0a51a3a41d 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -760,6 +760,22 @@ static void device_remove_class_symlinks(struct device *dev) } /** + * dev_set_name - set a device name + * @dev: device + * @fmt: format string for the device's name + */ +int dev_set_name(struct device *dev, const char *fmt, ...) +{ + va_list vargs; + + va_start(vargs, fmt); + vsnprintf(dev->bus_id, sizeof(dev->bus_id), fmt, vargs); + va_end(vargs); + return 0; +} +EXPORT_SYMBOL_GPL(dev_set_name); + +/** * device_add - add device to device hierarchy. * @dev: device. * diff --git a/drivers/base/node.c b/drivers/base/node.c index 39f3d1b3a213..0f867a083338 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -84,8 +84,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) nid, K(i.totalram), nid, K(i.freeram), nid, K(i.totalram - i.freeram), - nid, node_page_state(nid, NR_ACTIVE), - nid, node_page_state(nid, NR_INACTIVE), + nid, K(node_page_state(nid, NR_ACTIVE)), + nid, K(node_page_state(nid, NR_INACTIVE)), #ifdef CONFIG_HIGHMEM nid, K(i.totalhigh), nid, K(i.freehigh), |