* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
@ 2012-03-19 16:50 Stephen Warren
2012-03-19 16:54 ` Rob Herring
2012-03-19 16:59 ` Thierry Reding
0 siblings, 2 replies; 11+ messages in thread
From: Stephen Warren @ 2012-03-19 16:50 UTC (permalink / raw)
To: linux-arm-kernel
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 <swarren@wwwdotorg.org>
---
arch/arm/mach-tegra/sleep.S | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
index 8f9fde1..48cc7c6 100644
--- a/arch/arm/mach-tegra/sleep.S
+++ b/arch/arm/mach-tegra/sleep.S
@@ -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>
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
2012-03-19 16:50 [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break Stephen Warren
@ 2012-03-19 16:54 ` Rob Herring
2012-03-19 16:56 ` Stephen Warren
2012-03-19 16:59 ` Thierry Reding
1 sibling, 1 reply; 11+ messages in thread
From: Rob Herring @ 2012-03-19 16:54 UTC (permalink / raw)
To: linux-arm-kernel
On 03/19/2012 11:50 AM, Stephen Warren wrote:
> 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 <swarren@wwwdotorg.org>
> ---
> arch/arm/mach-tegra/sleep.S | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
> index 8f9fde1..48cc7c6 100644
> --- a/arch/arm/mach-tegra/sleep.S
> +++ b/arch/arm/mach-tegra/sleep.S
> @@ -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?
> #include <linux/linkage.h>
> +
> #include <mach/io.h>
> #include <mach/iomap.h>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
2012-03-19 16:54 ` Rob Herring
@ 2012-03-19 16:56 ` Stephen Warren
0 siblings, 0 replies; 11+ messages in thread
From: Stephen Warren @ 2012-03-19 16:56 UTC (permalink / raw)
To: linux-arm-kernel
On 03/19/2012 10:54 AM, Rob Herring wrote:
> On 03/19/2012 11:50 AM, Stephen Warren wrote:
>> 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 <swarren@wwwdotorg.org>
>> ---
>> arch/arm/mach-tegra/sleep.S | 3 +++
>> 1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
...
>> +#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?
>> #include <linux/linkage.h>
>> +
>> #include <mach/io.h>
>> #include <mach/iomap.h>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
2012-03-19 16:50 [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break Stephen Warren
2012-03-19 16:54 ` Rob Herring
@ 2012-03-19 16:59 ` Thierry Reding
1 sibling, 0 replies; 11+ messages in thread
From: Thierry Reding @ 2012-03-19 16:59 UTC (permalink / raw)
To: linux-arm-kernel
* Stephen Warren wrote:
> 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 <swarren@wwwdotorg.org>
> ---
> arch/arm/mach-tegra/sleep.S | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
> index 8f9fde1..48cc7c6 100644
> --- a/arch/arm/mach-tegra/sleep.S
> +++ b/arch/arm/mach-tegra/sleep.S
> @@ -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>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
@ 2012-03-19 17:07 Stephen Warren
2012-03-19 18:10 ` Rob Herring
0 siblings, 1 reply; 11+ messages in thread
From: Stephen Warren @ 2012-03-19 17:07 UTC (permalink / raw)
To: linux-arm-kernel
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 <swarren@wwwdotorg.org>
---
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(-)
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
index 8f9fde1..5b20197 100644
--- a/arch/arm/mach-tegra/sleep.S
+++ b/arch/arm/mach-tegra/sleep.S
@@ -23,7 +23,9 @@
*/
#include <linux/linkage.h>
-#include <mach/io.h>
+
+#include <asm/assembler.h>
+
#include <mach/iomap.h>
#include "flowctrl.h"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
2012-03-19 17:07 Stephen Warren
@ 2012-03-19 18:10 ` Rob Herring
2012-03-21 16:15 ` Stephen Warren
0 siblings, 1 reply; 11+ messages in thread
From: Rob Herring @ 2012-03-19 18:10 UTC (permalink / raw)
To: linux-arm-kernel
On 03/19/2012 12:07 PM, Stephen Warren wrote:
> 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 <swarren@wwwdotorg.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
> ---
> 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(-)
>
> diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
> index 8f9fde1..5b20197 100644
> --- a/arch/arm/mach-tegra/sleep.S
> +++ b/arch/arm/mach-tegra/sleep.S
> @@ -23,7 +23,9 @@
> */
>
> #include <linux/linkage.h>
> -#include <mach/io.h>
> +
> +#include <asm/assembler.h>
> +
> #include <mach/iomap.h>
>
> #include "flowctrl.h"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
2012-03-19 18:10 ` Rob Herring
@ 2012-03-21 16:15 ` Stephen Warren
2012-03-21 17:02 ` Rob Herring
0 siblings, 1 reply; 11+ messages in thread
From: Stephen Warren @ 2012-03-21 16:15 UTC (permalink / raw)
To: linux-arm-kernel
On 03/19/2012 12:10 PM, Rob Herring wrote:
> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>> 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 <swarren@wwwdotorg.org>
>
> Acked-by: Rob Herring <rob.herring@calxeda.com>
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
2012-03-21 16:15 ` Stephen Warren
@ 2012-03-21 17:02 ` Rob Herring
2012-03-21 17:05 ` Stephen Warren
0 siblings, 1 reply; 11+ messages in thread
From: Rob Herring @ 2012-03-21 17:02 UTC (permalink / raw)
To: linux-arm-kernel
On 03/21/2012 11:15 AM, Stephen Warren wrote:
> On 03/19/2012 12:10 PM, Rob Herring wrote:
>> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>>> 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 <swarren@wwwdotorg.org>
>>
>> Acked-by: Rob Herring <rob.herring@calxeda.com>
>
> 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/
>
I can take it and send the pull request. I've got a couple of other
fixes as well.
Rob
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
2012-03-21 17:02 ` Rob Herring
@ 2012-03-21 17:05 ` Stephen Warren
2012-03-21 17:19 ` Rob Herring
0 siblings, 1 reply; 11+ messages in thread
From: Stephen Warren @ 2012-03-21 17:05 UTC (permalink / raw)
To: linux-arm-kernel
On 03/21/2012 11:02 AM, Rob Herring wrote:
> On 03/21/2012 11:15 AM, Stephen Warren wrote:
>> On 03/19/2012 12:10 PM, Rob Herring wrote:
>>> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>>>> 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 <swarren@wwwdotorg.org>
>>>
>>> Acked-by: Rob Herring <rob.herring@calxeda.com>
>>
>> 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/
>
> 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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
2012-03-21 17:05 ` Stephen Warren
@ 2012-03-21 17:19 ` Rob Herring
2012-03-26 1:50 ` Rob Herring
0 siblings, 1 reply; 11+ messages in thread
From: Rob Herring @ 2012-03-21 17:19 UTC (permalink / raw)
To: linux-arm-kernel
On 03/21/2012 12:05 PM, Stephen Warren wrote:
> On 03/21/2012 11:02 AM, Rob Herring wrote:
>> On 03/21/2012 11:15 AM, Stephen Warren wrote:
>>> On 03/19/2012 12:10 PM, Rob Herring wrote:
>>>> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>>>>> 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 <swarren@wwwdotorg.org>
>>>>
>>>> Acked-by: Rob Herring <rob.herring@calxeda.com>
>>>
>>> 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/
>>
>> 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break
2012-03-21 17:19 ` Rob Herring
@ 2012-03-26 1:50 ` Rob Herring
0 siblings, 0 replies; 11+ messages in thread
From: Rob Herring @ 2012-03-26 1:50 UTC (permalink / raw)
To: linux-arm-kernel
Stephen,
On 03/21/2012 12:19 PM, Rob Herring wrote:
> On 03/21/2012 12:05 PM, Stephen Warren wrote:
>> On 03/21/2012 11:02 AM, Rob Herring wrote:
>>> On 03/21/2012 11:15 AM, Stephen Warren wrote:
>>>> On 03/19/2012 12:10 PM, Rob Herring wrote:
>>>>> On 03/19/2012 12:07 PM, Stephen Warren wrote:
>>>>>> 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 <swarren@wwwdotorg.org>
>>>>>
>>>>> Acked-by: Rob Herring <rob.herring@calxeda.com>
>>>>
>>>> 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/
>>>
>>> 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
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-03-26 1:50 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-19 16:50 [PATCH] ARM: tegra: Include assembler.h in sleep.S to fix build break Stephen Warren
2012-03-19 16:54 ` Rob Herring
2012-03-19 16:56 ` Stephen Warren
2012-03-19 16:59 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2012-03-19 17:07 Stephen Warren
2012-03-19 18:10 ` Rob Herring
2012-03-21 16:15 ` Stephen Warren
2012-03-21 17:02 ` Rob Herring
2012-03-21 17:05 ` Stephen Warren
2012-03-21 17:19 ` Rob Herring
2012-03-26 1:50 ` Rob Herring
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).