* [PATCH] omap2+: pm: fix compilation break.
@ 2012-03-29 10:09 Govindraj.R
2012-03-29 15:11 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Govindraj.R @ 2012-03-29 10:09 UTC (permalink / raw)
To: linux-arm-kernel
From: "Govindraj.R" <govindraj.raja@ti.com>
Fix the compilation break observed on latest mainline.
Fixes below compilation break:
arch/arm/mach-omap2/pm.c: In function 'omap_pm_begin':
arch/arm/mach-omap2/pm.c:239: error: implicit declaration of function 'disable_hlt'
arch/arm/mach-omap2/pm.c: In function 'omap_pm_end':
arch/arm/mach-omap2/pm.c:247: error: implicit declaration of function 'enable_hlt'
Cc: Kevin Hilman <khilman@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
---
arch/arm/mach-omap2/pm.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index a7bdec6..70da4f7 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -16,6 +16,7 @@
#include <linux/opp.h>
#include <linux/export.h>
#include <linux/suspend.h>
+#include <asm/system_misc.h>
#include <plat/omap-pm.h>
#include <plat/omap_device.h>
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] omap2+: pm: fix compilation break.
2012-03-29 10:09 [PATCH] omap2+: pm: fix compilation break Govindraj.R
@ 2012-03-29 15:11 ` Tony Lindgren
2012-03-29 16:33 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Tony Lindgren @ 2012-03-29 15:11 UTC (permalink / raw)
To: linux-arm-kernel
* Govindraj.R <govindraj.raja@ti.com> [120329 03:12]:
> From: "Govindraj.R" <govindraj.raja@ti.com>
>
> Fix the compilation break observed on latest mainline.
>
> Fixes below compilation break:
>
> arch/arm/mach-omap2/pm.c: In function 'omap_pm_begin':
> arch/arm/mach-omap2/pm.c:239: error: implicit declaration of function 'disable_hlt'
> arch/arm/mach-omap2/pm.c: In function 'omap_pm_end':
> arch/arm/mach-omap2/pm.c:247: error: implicit declaration of function 'enable_hlt'
Care to mention which commit broke the compile?
Regards,
Tony
> Cc: Kevin Hilman <khilman@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
> ---
> arch/arm/mach-omap2/pm.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
> index a7bdec6..70da4f7 100644
> --- a/arch/arm/mach-omap2/pm.c
> +++ b/arch/arm/mach-omap2/pm.c
> @@ -16,6 +16,7 @@
> #include <linux/opp.h>
> #include <linux/export.h>
> #include <linux/suspend.h>
> +#include <asm/system_misc.h>
>
> #include <plat/omap-pm.h>
> #include <plat/omap_device.h>
> --
> 1.7.5.4
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] omap2+: pm: fix compilation break.
2012-03-29 15:11 ` Tony Lindgren
@ 2012-03-29 16:33 ` Tony Lindgren
2012-03-29 16:55 ` Kevin Hilman
0 siblings, 1 reply; 4+ messages in thread
From: Tony Lindgren @ 2012-03-29 16:33 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120329 08:14]:
> * Govindraj.R <govindraj.raja@ti.com> [120329 03:12]:
> > From: "Govindraj.R" <govindraj.raja@ti.com>
> >
> > Fix the compilation break observed on latest mainline.
> >
> > Fixes below compilation break:
> >
> > arch/arm/mach-omap2/pm.c: In function 'omap_pm_begin':
> > arch/arm/mach-omap2/pm.c:239: error: implicit declaration of function 'disable_hlt'
> > arch/arm/mach-omap2/pm.c: In function 'omap_pm_end':
> > arch/arm/mach-omap2/pm.c:247: error: implicit declaration of function 'enable_hlt'
>
> Care to mention which commit broke the compile?
Seems like it was 9f97da78 (Disintegrate asm/system.h for ARM),
and also needs to be fixed for omap1 too. Using the updated
patch below.
Tony
From: Govindraj.R <govindraj.raja@ti.com>
Date: Thu, 29 Mar 2012 09:30:28 -0700
Subject: [PATCH] ARM: OMAP: pm: fix compilation break
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix the compilation break observed on latest mainline caused
by 9f97da78 (Disintegrate asm/system.h for ARM):
arch/arm/mach-omap1/pm.c: In function ?omap_pm_prepare?:
arch/arm/mach-omap1/pm.c:587: error: implicit declaration of function ?disable_hlt?
arch/arm/mach-omap1/pm.c: In function ?omap_pm_finish?:
arch/arm/mach-omap1/pm.c:624: error: implicit declaration of function ?enable_hlt?
arch/arm/mach-omap1/pm.c: In function ?omap_pm_init?:
arch/arm/mach-omap1/pm.c:681: error: ?arm_pm_idle? undeclared (first use in this function)
...
arch/arm/mach-omap2/pm.c: In function 'omap_pm_begin':
arch/arm/mach-omap2/pm.c:239: error: implicit declaration of function 'disable_hlt'
arch/arm/mach-omap2/pm.c: In function 'omap_pm_end':
arch/arm/mach-omap2/pm.c:247: error: implicit declaration of function 'enable_hlt'
Cc: Kevin Hilman <khilman@ti.com>
Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
[tony at atomide.com: updated to fix omap1 too]
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 306beac..f66c329 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -44,6 +44,7 @@
#include <linux/io.h>
#include <linux/atomic.h>
+#include <asm/system_misc.h>
#include <asm/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/irq.h>
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index a7bdec6..d0c1c96 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -17,6 +17,8 @@
#include <linux/export.h>
#include <linux/suspend.h>
+#include <asm/system_misc.h>
+
#include <plat/omap-pm.h>
#include <plat/omap_device.h>
#include "common.h"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] omap2+: pm: fix compilation break.
2012-03-29 16:33 ` Tony Lindgren
@ 2012-03-29 16:55 ` Kevin Hilman
0 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2012-03-29 16:55 UTC (permalink / raw)
To: linux-arm-kernel
Tony Lindgren <tony@atomide.com> writes:
> * Tony Lindgren <tony@atomide.com> [120329 08:14]:
>> * Govindraj.R <govindraj.raja@ti.com> [120329 03:12]:
>> > From: "Govindraj.R" <govindraj.raja@ti.com>
>> >
>> > Fix the compilation break observed on latest mainline.
>> >
>> > Fixes below compilation break:
>> >
>> > arch/arm/mach-omap2/pm.c: In function 'omap_pm_begin':
>> > arch/arm/mach-omap2/pm.c:239: error: implicit declaration of function 'disable_hlt'
>> > arch/arm/mach-omap2/pm.c: In function 'omap_pm_end':
>> > arch/arm/mach-omap2/pm.c:247: error: implicit declaration of function 'enable_hlt'
>>
>> Care to mention which commit broke the compile?
>
> Seems like it was 9f97da78 (Disintegrate asm/system.h for ARM),
> and also needs to be fixed for omap1 too. Using the updated
> patch below.
>
> Tony
>
>
> From: Govindraj.R <govindraj.raja@ti.com>
> Date: Thu, 29 Mar 2012 09:30:28 -0700
> Subject: [PATCH] ARM: OMAP: pm: fix compilation break
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> Fix the compilation break observed on latest mainline caused
> by 9f97da78 (Disintegrate asm/system.h for ARM):
>
> arch/arm/mach-omap1/pm.c: In function ?omap_pm_prepare?:
> arch/arm/mach-omap1/pm.c:587: error: implicit declaration of function ?disable_hlt?
> arch/arm/mach-omap1/pm.c: In function ?omap_pm_finish?:
> arch/arm/mach-omap1/pm.c:624: error: implicit declaration of function ?enable_hlt?
> arch/arm/mach-omap1/pm.c: In function ?omap_pm_init?:
> arch/arm/mach-omap1/pm.c:681: error: ?arm_pm_idle? undeclared (first use in this function)
> ...
>
> arch/arm/mach-omap2/pm.c: In function 'omap_pm_begin':
> arch/arm/mach-omap2/pm.c:239: error: implicit declaration of function 'disable_hlt'
> arch/arm/mach-omap2/pm.c: In function 'omap_pm_end':
> arch/arm/mach-omap2/pm.c:247: error: implicit declaration of function 'enable_hlt'
>
> Cc: Kevin Hilman <khilman@ti.com>
> Signed-off-by: Govindraj.R <govindraj.raja@ti.com>
> [tony at atomide.com: updated to fix omap1 too]
> Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Kevin Hilman <khilman@ti.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-29 16:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-29 10:09 [PATCH] omap2+: pm: fix compilation break Govindraj.R
2012-03-29 15:11 ` Tony Lindgren
2012-03-29 16:33 ` Tony Lindgren
2012-03-29 16:55 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).