Skip to contentSkip to conversation

ARM: tegra: Include assembler.h in sleep.S to fix build break

PATCH New Stephen Warren 3 participants 4 messages Mar 19, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures Tegra architecture support
lore
Share & tools
lore

Stephen Warren

author
#0 lore raw

PATCH 1/1 ARM: tegra: Include assembler.h in sleep.S to fix build break

Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's sleep.S to do so.

Signed-off-by Stephen Warren <[email protected]>
---
 arch/arm/mach-tegra/sleep.S |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-tegra/sleep.S +3 -0
index 8f9fde1..48cc7c6 100644
@@ -22,7 +22,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <asm/assembler.h>
+
 #include <linux/linkage.h>
+
 #include <mach/io.h>
 #include <mach/iomap.h>
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 ARM: tegra: Include assembler.h in sleep.S to fix build break

Quoted 14 lines · Stephen Warren

Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's sleep.S to do so.

Signed-off-by Stephen Warren <[email protected]>
---
 arch/arm/mach-tegra/sleep.S |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-tegra/sleep.S +0 -0
index 8f9fde1..48cc7c6 100644

arch/arm/mach-tegra/sleep.S line 26

Quoted 5 lines
arch/arm/mach-tegra/sleep.S +2 -0
@@ -22,7 +22,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <asm/assembler.h>
+

Is there some reason you put this before linux/ include?

Quoted 5 lines
arch/arm/mach-tegra/sleep.S +1 -0
 #include <linux/linkage.h>
+
 #include <mach/io.h>
 #include <mach/iomap.h>
author
#2 lore raw

PATCH 1/1 ARM: tegra: Include assembler.h in sleep.S to fix build break

Quoted 11 lines · Rob Herring
Quoted 10 lines · Stephen Warren

Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's sleep.S to do so.

Signed-off-by Stephen Warren <[email protected]>
---
 arch/arm/mach-tegra/sleep.S |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-tegra/sleep.S +0 -0

...

Quoted 4 lines

arch/arm/mach-tegra/sleep.S

Quoted 2 lines
arch/arm/mach-tegra/sleep.S +2 -0
+#include <asm/assembler.h>
+

Is there some reason you put this before linux/ include?

No. I just misremembered which order linux/ and asm/ should go in. Do you want me to repost?

Quoted 4 lines
Quoted 4 lines

#include <linux/linkage.h>
+
#include <mach/io.h>
#include <mach/iomap.h>

#3 lore raw

PATCH 1/1 ARM: tegra: Include assembler.h in sleep.S to fix build break

In reply to Stephen Warren
Quoted 14 lines · Stephen Warren

Commit 6f6f6a7 "ARM: create a common IOMEM definition" moved macro IOMEM(), and requires users to include <asm/assembler.h>. Fix Tegra's sleep.S to do so.

Signed-off-by Stephen Warren <[email protected]>
---
 arch/arm/mach-tegra/sleep.S |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-tegra/sleep.S +0 -0
index 8f9fde1..48cc7c6 100644

arch/arm/mach-tegra/sleep.S line 30

Quoted 9 lines
arch/arm/mach-tegra/sleep.S +3 -0
@@ -22,7 +22,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <asm/assembler.h>
+
 #include <linux/linkage.h>
+
 #include <mach/io.h>
 #include <mach/iomap.h>

I actually had a similar patch that looked pretty much like this:

	-#include <mach/io.h>
	+#include <asm/assembler.h>

The mach/io.h is no longer required AFAICT.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120319/5c60ee5f/attachment.sig>