2013-04-28 01:47:10

by Zefan Li

Subject: [PATCH] cpuset: fix compile warning when CONFIG_SMP=n

Reported by Fengguang's kbuild test robot:

kernel/cpuset.c:787: warning: 'generate_sched_domains' defined but not used

Introduced by commit e0e80a02e5701c8790bd348ab59edb154fbda60b
("cpuset: use rebuild_sched_domains() in cpuset_hotplug_workfn()),
which removed generate_sched_domains() from cpuset_hotplug_workfn().

Reported-by: Fengguang Wu <[email protected]>
Signed-off-by: Li Zefan <[email protected]>
---
kernel/cpuset.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index ef05901..2422c5b 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -789,13 +789,6 @@ out:
static void rebuild_sched_domains_locked(void)
{
}
-
-static int generate_sched_domains(cpumask_var_t **domains,
- struct sched_domain_attr **attributes)
-{
- *domains = NULL;
- return 1;
-}
#endif /* CONFIG_SMP */

void rebuild_sched_domains(void)
--
1.8.0.2

2013-04-28 02:01:12

by Li Zhong

Subject: Re: [PATCH] cpuset: fix compile warning when CONFIG_SMP=n

On Sun, 2013-04-28 at 09:46 +0800, Li Zefan wrote:
> Reported by Fengguang's kbuild test robot:

Thank you for the quick fix, Zefan.

Strong robot :)

Thanks, Zhong

>
> kernel/cpuset.c:787: warning: 'generate_sched_domains' defined but not used
>
> Introduced by commit e0e80a02e5701c8790bd348ab59edb154fbda60b
> ("cpuset: use rebuild_sched_domains() in cpuset_hotplug_workfn()),
> which removed generate_sched_domains() from cpuset_hotplug_workfn().
>
> Reported-by: Fengguang Wu <[email protected]>
> Signed-off-by: Li Zefan <[email protected]>
> ---
> kernel/cpuset.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/kernel/cpuset.c b/kernel/cpuset.c
> index ef05901..2422c5b 100644
> --- a/kernel/cpuset.c
> +++ b/kernel/cpuset.c
> @@ -789,13 +789,6 @@ out:
> static void rebuild_sched_domains_locked(void)
> {
> }
> -
> -static int generate_sched_domains(cpumask_var_t **domains,
> - struct sched_domain_attr **attributes)
> -{
> - *domains = NULL;
> - return 1;
> -}
> #endif /* CONFIG_SMP */
>
> void rebuild_sched_domains(void)

2013-04-28 02:55:41

by Tejun Heo

Subject: Re: [PATCH] cpuset: fix compile warning when CONFIG_SMP=n

On Sun, Apr 28, 2013 at 09:46:57AM +0800, Li Zefan wrote:
> Reported by Fengguang's kbuild test robot:
>
> kernel/cpuset.c:787: warning: 'generate_sched_domains' defined but not used
>
> Introduced by commit e0e80a02e5701c8790bd348ab59edb154fbda60b
> ("cpuset: use rebuild_sched_domains() in cpuset_hotplug_workfn()),
> which removed generate_sched_domains() from cpuset_hotplug_workfn().
>
> Reported-by: Fengguang Wu <[email protected]>
> Signed-off-by: Li Zefan <[email protected]>

Applied to cgroup/for-3.10. Thanks.

--
tejun