* [-mm patch] cpu_idle: fix build break
2007-03-02 11:00 2.6.21-rc2-mm1 Andrew Morton
@ 2007-03-02 14:40 ` Frederik Deweerdt
2007-03-02 15:24 ` Venkatesh Pallipadi
0 siblings, 1 reply; 4+ messages in thread
From: Frederik Deweerdt @ 2007-03-02 14:40 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-kernel, venkatesh.pallipadi, abelay, shaohua.li, len.brown
On Fri, Mar 02, 2007 at 03:00:26AM -0800, Andrew Morton wrote:
> +git-acpi-fix-cpuidle-borkage.patch
This attached patch might be needed too, the build breaks if
!CONFIG_HOTPLUG_CPU and CONFIG_CPU_IDLE
CC drivers/cpuidle/cpuidle.o
drivers/cpuidle/cpuidle.c: In function 'cpuidle_init':
drivers/cpuidle/cpuidle.c:272: erreur: 'cpuidle_cpu_notifier' undeclared (first use in this function)
drivers/cpuidle/cpuidle.c:272: erreur: (Each undeclared identifier is reported only once
drivers/cpuidle/cpuidle.c:272: erreur: for each function it appears in.)
make[2]: *** [drivers/cpuidle/cpuidle.o] Erreur 1
make[1]: *** [drivers/cpuidle] Erreur 2
make: *** [drivers] Erreur 2
Regards,
Frederik
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index dc626d9..9aa1734 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -269,7 +269,9 @@ static int __init cpuidle_init(void)
if (ret)
return ret;
+#ifdef CONFIG_HOTPLUG_CPU
register_hotcpu_notifier(&cpuidle_cpu_notifier);
+#endif
ret = sysdev_driver_register(&cpu_sysdev_class, &cpuidle_sysdev_driver);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [-mm patch] cpu_idle: fix build break
2007-03-02 14:40 ` [-mm patch] cpu_idle: fix build break Frederik Deweerdt
@ 2007-03-02 15:24 ` Venkatesh Pallipadi
2007-03-02 16:24 ` Frederik Deweerdt
0 siblings, 1 reply; 4+ messages in thread
From: Venkatesh Pallipadi @ 2007-03-02 15:24 UTC (permalink / raw)
To: Frederik Deweerdt
Cc: Andrew Morton, linux-kernel, venkatesh.pallipadi, abelay,
shaohua.li, len.brown
On Fri, Mar 02, 2007 at 02:40:07PM +0000, Frederik Deweerdt wrote:
> On Fri, Mar 02, 2007 at 03:00:26AM -0800, Andrew Morton wrote:
> > +git-acpi-fix-cpuidle-borkage.patch
> This attached patch might be needed too, the build breaks if
> !CONFIG_HOTPLUG_CPU and CONFIG_CPU_IDLE
>
> CC drivers/cpuidle/cpuidle.o
> drivers/cpuidle/cpuidle.c: In function 'cpuidle_init':
> drivers/cpuidle/cpuidle.c:272: erreur: 'cpuidle_cpu_notifier' undeclared (first use in this function)
> drivers/cpuidle/cpuidle.c:272: erreur: (Each undeclared identifier is reported only once
> drivers/cpuidle/cpuidle.c:272: erreur: for each function it appears in.)
> make[2]: *** [drivers/cpuidle/cpuidle.o] Erreur 1
> make[1]: *** [drivers/cpuidle] Erreur 2
> make: *** [drivers] Erreur 2
>
Thanks for catching this breakage. Patch below should be the proper fix.
Thanks,
Venki
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Index: linux-2.6.21-rc-mm/drivers/cpuidle/cpuidle.c
===================================================================
--- linux-2.6.21-rc-mm.orig/drivers/cpuidle/cpuidle.c
+++ linux-2.6.21-rc-mm/drivers/cpuidle/cpuidle.c
@@ -189,10 +189,6 @@ static struct sysdev_driver cpuidle_sysd
.remove = cpuidle_remove_device,
};
-#ifdef CONFIG_SMP
-
-#ifdef CONFIG_HOTPLUG_CPU
-
static int cpuidle_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
@@ -224,7 +220,7 @@ static struct notifier_block __cpuinitda
.notifier_call = cpuidle_cpu_callback,
};
-#endif /* CONFIG_HOTPLUG_CPU */
+#ifdef CONFIG_SMP
static void smp_callback(void *v)
{
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [-mm patch] cpu_idle: fix build break
2007-03-02 15:24 ` Venkatesh Pallipadi
@ 2007-03-02 16:24 ` Frederik Deweerdt
0 siblings, 0 replies; 4+ messages in thread
From: Frederik Deweerdt @ 2007-03-02 16:24 UTC (permalink / raw)
To: Venkatesh Pallipadi
Cc: Andrew Morton, linux-kernel, abelay, shaohua.li, len.brown
On Fri, Mar 02, 2007 at 07:24:28AM -0800, Venkatesh Pallipadi wrote:
> On Fri, Mar 02, 2007 at 02:40:07PM +0000, Frederik Deweerdt wrote:
> > On Fri, Mar 02, 2007 at 03:00:26AM -0800, Andrew Morton wrote:
> > > +git-acpi-fix-cpuidle-borkage.patch
> > This attached patch might be needed too, the build breaks if
> > !CONFIG_HOTPLUG_CPU and CONFIG_CPU_IDLE
> >
> > CC drivers/cpuidle/cpuidle.o
> > drivers/cpuidle/cpuidle.c: In function 'cpuidle_init':
> > drivers/cpuidle/cpuidle.c:272: erreur: 'cpuidle_cpu_notifier' undeclared (first use in this function)
> > drivers/cpuidle/cpuidle.c:272: erreur: (Each undeclared identifier is reported only once
> > drivers/cpuidle/cpuidle.c:272: erreur: for each function it appears in.)
> > make[2]: *** [drivers/cpuidle/cpuidle.o] Erreur 1
> > make[1]: *** [drivers/cpuidle] Erreur 2
> > make: *** [drivers] Erreur 2
> >
>
> Thanks for catching this breakage. Patch below should be the proper fix.
Yep, works for me.
Regards,
Frederik
^ permalink raw reply [flat|nested] 4+ messages in thread
* [-mm patch] cpu_idle: fix build break
@ 2007-03-06 23:41 Adrian Bunk
0 siblings, 0 replies; 4+ messages in thread
From: Adrian Bunk @ 2007-03-06 23:41 UTC (permalink / raw)
To: Andrew Morton; +Cc: Venkatesh Pallipadi, linux-kernel, shaohua.li, len.brown
From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
This patch fixes a build breakage with !CONFIG_HOTPLUG_CPU and
CONFIG_CPU_IDLE.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was sent by Venkatesh Pallipadi on:
- 2 Mar 2007
--- linux-2.6.21-rc-mm.orig/drivers/cpuidle/cpuidle.c
+++ linux-2.6.21-rc-mm/drivers/cpuidle/cpuidle.c
@@ -189,10 +189,6 @@ static struct sysdev_driver cpuidle_sysd
.remove = cpuidle_remove_device,
};
-#ifdef CONFIG_SMP
-
-#ifdef CONFIG_HOTPLUG_CPU
-
static int cpuidle_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
@@ -224,7 +220,7 @@ static struct notifier_block __cpuinitda
.notifier_call = cpuidle_cpu_callback,
};
-#endif /* CONFIG_HOTPLUG_CPU */
+#ifdef CONFIG_SMP
static void smp_callback(void *v)
{
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-03-06 23:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-06 23:41 [-mm patch] cpu_idle: fix build break Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2007-03-02 11:00 2.6.21-rc2-mm1 Andrew Morton
2007-03-02 14:40 ` [-mm patch] cpu_idle: fix build break Frederik Deweerdt
2007-03-02 15:24 ` Venkatesh Pallipadi
2007-03-02 16:24 ` Frederik Deweerdt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox