diff options
Diffstat (limited to 'drivers/base/topology.c')
| -rw-r--r-- | drivers/base/topology.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/base/topology.c b/drivers/base/topology.c index 3f6d9b0a6abe..199cd97e32e6 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c | |||
| @@ -34,7 +34,8 @@ | |||
| 34 | static SYSDEV_ATTR(_name, 0444, show_##_name, NULL) | 34 | static SYSDEV_ATTR(_name, 0444, show_##_name, NULL) |
| 35 | 35 | ||
| 36 | #define define_id_show_func(name) \ | 36 | #define define_id_show_func(name) \ |
| 37 | static ssize_t show_##name(struct sys_device *dev, char *buf) \ | 37 | static ssize_t show_##name(struct sys_device *dev, \ |
| 38 | struct sysdev_attribute *attr, char *buf) \ | ||
| 38 | { \ | 39 | { \ |
| 39 | unsigned int cpu = dev->id; \ | 40 | unsigned int cpu = dev->id; \ |
| 40 | return sprintf(buf, "%d\n", topology_##name(cpu)); \ | 41 | return sprintf(buf, "%d\n", topology_##name(cpu)); \ |
| @@ -59,14 +60,17 @@ static ssize_t show_cpumap(int type, cpumask_t *mask, char *buf) | |||
| 59 | 60 | ||
| 60 | #ifdef arch_provides_topology_pointers | 61 | #ifdef arch_provides_topology_pointers |
| 61 | #define define_siblings_show_map(name) \ | 62 | #define define_siblings_show_map(name) \ |
| 62 | static ssize_t show_##name(struct sys_device *dev, char *buf) \ | 63 | static ssize_t show_##name(struct sys_device *dev, \ |
| 64 | struct sysdev_attribute *attr, char *buf) \ | ||
| 63 | { \ | 65 | { \ |
| 64 | unsigned int cpu = dev->id; \ | 66 | unsigned int cpu = dev->id; \ |
| 65 | return show_cpumap(0, &(topology_##name(cpu)), buf); \ | 67 | return show_cpumap(0, &(topology_##name(cpu)), buf); \ |
| 66 | } | 68 | } |
| 67 | 69 | ||
| 68 | #define define_siblings_show_list(name) \ | 70 | #define define_siblings_show_list(name) \ |
| 69 | static ssize_t show_##name##_list(struct sys_device *dev, char *buf) \ | 71 | static ssize_t show_##name##_list(struct sys_device *dev, \ |
| 72 | struct sysdev_attribute *attr, \ | ||
| 73 | char *buf) \ | ||
| 70 | { \ | 74 | { \ |
| 71 | unsigned int cpu = dev->id; \ | 75 | unsigned int cpu = dev->id; \ |
| 72 | return show_cpumap(1, &(topology_##name(cpu)), buf); \ | 76 | return show_cpumap(1, &(topology_##name(cpu)), buf); \ |
| @@ -74,7 +78,8 @@ static ssize_t show_##name##_list(struct sys_device *dev, char *buf) \ | |||
| 74 | 78 | ||
| 75 | #else | 79 | #else |
| 76 | #define define_siblings_show_map(name) \ | 80 | #define define_siblings_show_map(name) \ |
| 77 | static ssize_t show_##name(struct sys_device *dev, char *buf) \ | 81 | static ssize_t show_##name(struct sys_device *dev, \ |
| 82 | struct sysdev_attribute *attr, char *buf) \ | ||
| 78 | { \ | 83 | { \ |
| 79 | unsigned int cpu = dev->id; \ | 84 | unsigned int cpu = dev->id; \ |
| 80 | cpumask_t mask = topology_##name(cpu); \ | 85 | cpumask_t mask = topology_##name(cpu); \ |
| @@ -82,7 +87,9 @@ static ssize_t show_##name(struct sys_device *dev, char *buf) \ | |||
| 82 | } | 87 | } |
| 83 | 88 | ||
| 84 | #define define_siblings_show_list(name) \ | 89 | #define define_siblings_show_list(name) \ |
| 85 | static ssize_t show_##name##_list(struct sys_device *dev, char *buf) \ | 90 | static ssize_t show_##name##_list(struct sys_device *dev, \ |
| 91 | struct sysdev_attribute *attr, \ | ||
| 92 | char *buf) \ | ||
| 86 | { \ | 93 | { \ |
| 87 | unsigned int cpu = dev->id; \ | 94 | unsigned int cpu = dev->id; \ |
| 88 | cpumask_t mask = topology_##name(cpu); \ | 95 | cpumask_t mask = topology_##name(cpu); \ |