| From 53974e06603977f348ed978d75c426b0532daa67 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle@laposte.net> |
| Date: Fri, 4 Apr 2014 08:43:18 +0200 |
| Subject: topology: Fix compilation warning when not in SMP |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle@laposte.net> |
| |
| commit 53974e06603977f348ed978d75c426b0532daa67 upstream. |
| |
| The topology_##name() macro does not use its argument when CONFIG_SMP is not |
| set, as it ultimately calls the cpu_data() macro. |
| |
| So we avoid maintaining a possibly unused `cpu' variable, to avoid the |
| following compilation warning: |
| |
| drivers/base/topology.c: In function ‘show_physical_package_id’: |
| drivers/base/topology.c:103:118: warning: unused variable ‘cpu’ [-Wunused-variable] |
| define_id_show_func(physical_package_id); |
| |
| drivers/base/topology.c: In function ‘show_core_id’: |
| drivers/base/topology.c:106:106: warning: unused variable ‘cpu’ [-Wunused-variable] |
| define_id_show_func(core_id); |
| |
| This can be seen with e.g. x86 defconfig and CONFIG_SMP not set. |
| |
| Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/base/topology.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/base/topology.c |
| +++ b/drivers/base/topology.c |
| @@ -40,8 +40,7 @@ |
| static ssize_t show_##name(struct device *dev, \ |
| struct device_attribute *attr, char *buf) \ |
| { \ |
| - unsigned int cpu = dev->id; \ |
| - return sprintf(buf, "%d\n", topology_##name(cpu)); \ |
| + return sprintf(buf, "%d\n", topology_##name(dev->id)); \ |
| } |
| |
| #if defined(topology_thread_cpumask) || defined(topology_core_cpumask) || \ |