Skip to contentSkip to conversation

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

PATCH New Stephen Warren 2 participants 7 messages Mar 19, 2012 – Mar 26, 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]>

---
v2: Fix linux/ vs. asm/ include ordering. Remove include of io.h too.

 arch/arm/mach-tegra/sleep.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/mach-tegra/sleep.S +3 -1
index 8f9fde1..5b20197 100644
@@ -23,7 +23,9 @@
  */
 
 #include <linux/linkage.h>
-#include <mach/io.h>
+
+#include <asm/assembler.h>
+
 #include <mach/iomap.h>
 
 #include "flowctrl.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 5 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]>
Acked-by Rob Herring <[email protected]>
Quoted 21 lines

---
v2: Fix linux/ vs. asm/ include ordering. Remove include of io.h too.

 arch/arm/mach-tegra/sleep.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/arm/mach-tegra/sleep.S +3 -1
index 8f9fde1..5b20197 100644
@@ -23,7 +23,9 @@
  */
 
 #include <linux/linkage.h>
-#include <mach/io.h>
+
+#include <asm/assembler.h>
+
 #include <mach/iomap.h>
 
 #include "flowctrl.h"
author
#2 lore raw

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

Quoted 8 lines · Rob Herring
Quoted 5 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]>
Acked-by Rob Herring <[email protected]>

Arnd,

Can you pick up this fix directly into arm-soc, or do you want me to generate a pull request for this kind of thing too?

ARM: tegra: Include assembler.h in sleep.S to fix build break
http://patchwork.ozlabs.org/patch/147587/

The same goes for:

ARM: tegra: Fix device tree AUXDATA for USB/EHCI
http://patchwork.ozlabs.org/patch/147616/

Thanks.

#3 lore raw

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

Quoted 15 lines · Stephen Warren
Quoted 8 lines · Rob Herring
Quoted 5 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]>
Acked-by Rob Herring <[email protected]>

Arnd,

Can you pick up this fix directly into arm-soc, or do you want me to generate a pull request for this kind of thing too?

Quoted 8 lines

ARM: tegra: Include assembler.h in sleep.S to fix build break
http://patchwork.ozlabs.org/patch/147587/

The same goes for:

ARM: tegra: Fix device tree AUXDATA for USB/EHCI
http://patchwork.ozlabs.org/patch/147616/

I can take it and send the pull request. I've got a couple of other fixes as well.

Rob

author
#4 lore raw

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

Quoted 19 lines · Rob Herring
Quoted 18 lines · Stephen Warren
Quoted 8 lines · Rob Herring
Quoted 5 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]>
Acked-by Rob Herring <[email protected]>

Arnd,

Can you pick up this fix directly into arm-soc, or do you want me to generate a pull request for this kind of thing too?

ARM: tegra: Include assembler.h in sleep.S to fix build break
http://patchwork.ozlabs.org/patch/147587/

Quoted 7 lines
Quoted 4 lines

The same goes for:

ARM: tegra: Fix device tree AUXDATA for USB/EHCI
http://patchwork.ozlabs.org/patch/147616/

I can take it and send the pull request. I've got a couple of other fixes as well.

That's just for the sleep.S change, right.

#5 lore raw

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

Quoted 22 lines · Stephen Warren
Quoted 21 lines · Rob Herring
Quoted 20 lines · Stephen Warren
Quoted 8 lines · Rob Herring
Quoted 5 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]>
Acked-by Rob Herring <[email protected]>

Arnd,

Can you pick up this fix directly into arm-soc, or do you want me to generate a pull request for this kind of thing too?

ARM: tegra: Include assembler.h in sleep.S to fix build break
http://patchwork.ozlabs.org/patch/147587/

The same goes for:

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

ARM: tegra: Fix device tree AUXDATA for USB/EHCI
http://patchwork.ozlabs.org/patch/147616/

I can take it and send the pull request. I've got a couple of other fixes as well.

That's just for the sleep.S change, right.

Ah, I missed the 2nd one. So it makes less sense now for me to take it. I'm still happy to, but it doesn't really save you anything.

Rob

Rob

#6 lore raw

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

Stephen,

Quoted 26 lines · Rob Herring
Quoted 25 lines · Stephen Warren
Quoted 24 lines · Rob Herring
Quoted 22 lines · Stephen Warren
Quoted 8 lines · Rob Herring
Quoted 5 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]>
Acked-by Rob Herring <[email protected]>

Arnd,

Can you pick up this fix directly into arm-soc, or do you want me to generate a pull request for this kind of thing too?

ARM: tegra: Include assembler.h in sleep.S to fix build break
http://patchwork.ozlabs.org/patch/147587/

The same goes for:

ARM: tegra: Fix device tree AUXDATA for USB/EHCI
http://patchwork.ozlabs.org/patch/147616/

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

I can take it and send the pull request. I've got a couple of other fixes as well.

That's just for the sleep.S change, right.

Ah, I missed the 2nd one. So it makes less sense now for me to take it. I'm still happy to, but it doesn't really save you anything.

After our irc discussion, I pulled this in and then realized this is a newly added file that's not in my tree. So you should send this fix to Arnd/Olof.

Rob