omap2+: pm: fix compilation break.

PATCH New Govindraj.R 3 participants 4 messages Mar 29, 2012

Subsystems (5)

Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP1 support +1 more subsystems

lore

Share & tools

lore

Govindraj.R

author

2012-03-29 10:09 UTC #0 lore raw

PATCH 1/1 omap2+: pm: fix compilation break.

From: "Govindraj.R" <[email protected]>

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 <[email protected]>

Cc Tony Lindgren <[email protected]>

Signed-off-by Govindraj.R <[email protected]>

---
 arch/arm/mach-omap2/pm.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

arch/arm/mach-omap2/pm.c +1 -0

index a7bdec6..70da4f7 100644
@@ -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>

Signature · 1 line

1.7.5.4

Tony Lindgren

maintainer

2012-03-29 15:11 UTC #1 lore raw

PATCH 1/1 omap2+: pm: fix compilation break.

Quoted 10 lines · Govindraj.R

From: "Govindraj.R" <[email protected]>
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

Quoted 22 lines

Cc Kevin Hilman <[email protected]>
Cc Tony Lindgren <[email protected]>
Signed-off-by Govindraj.R <[email protected]>
---
 arch/arm/mach-omap2/pm.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/pm.c +1 -0
index a7bdec6..70da4f7 100644
@@ -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>
Signature · 1 line
1.7.5.4

Tony Lindgren

maintainer

2012-03-29 16:33 UTC #2 lore raw

PATCH 1/1 omap2+: pm: fix compilation break.

Quoted 5 lines · Tony Lindgren

Quoted 4 lines · Govindraj.R
From: "Govindraj.R" <[email protected]>
Fix the compilation break observed on latest mainline.

Quoted 8 lines

Quoted 6 lines
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 <[email protected]>
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)
...

Cc Kevin Hilman <[email protected]>

Signed-off-by Govindraj.R <[email protected]>

[tony at atomide.com: updated to fix omap1 too]

Signed-off-by Tony Lindgren <[email protected]>

arch/arm/mach-omap1/pm.c +1 -0

index 306beac..f66c329 100644
@@ -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>

arch/arm/mach-omap2/pm.c +2 -0

index a7bdec6..d0c1c96 100644
@@ -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"

Kevin Hilman

2012-03-29 16:55 UTC #3 lore raw

PATCH 1/1 omap2+: pm: fix compilation break.

Quoted 45 lines · Tony Lindgren

Quoted 5 lines · Tony Lindgren
Quoted 4 lines · Govindraj.R
From: "Govindraj.R" <[email protected]>
Fix the compilation break observed on latest mainline.
Quoted 8 lines
Quoted 6 lines
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 <[email protected]>
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'

Quoted 4 lines

Cc Kevin Hilman <[email protected]>
Signed-off-by Govindraj.R <[email protected]>
[tony at atomide.com: updated to fix omap1 too]
Signed-off-by Tony Lindgren <[email protected]>

Acked-by Kevin Hilman <[email protected]>