diff mbox

[Xen-devel,17/34] xen/arm: Guard correctly asm-arm/platform/omap5.h

Message ID 1395766541-23979-18-git-send-email-julien.grall@linaro.org
State Deferred, archived
Headers show

Commit Message

Julien Grall March 25, 2014, 4:55 p.m. UTC
Fix compilation with clang 3.5:

xen/include/asm/platforms/omap5.h:1:9: error: '__ASM_ARM_PLATFORMS_OMAP5_H' is used as a header guard here, followed by #define of a different macro [-werror,-wheader-guard]
                                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~
xen/include/asm/platforms/omap5.h:2:9: note: '__ASM_ASM_PLATFORMS_OMAP5_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_OMAP5_H'?
                                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~
        __ASM_ARM_PLATFORMS_OMAP5_H

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Cc:Ian Campbell <ian.campbell@citrix.com>
Cc:Stefano Stabellini <stefano.stabellini@citrix.com>
Cc:Tim Deegan <tim@xen.org>
---
 xen/include/asm-arm/platforms/omap5.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ian Campbell March 27, 2014, 4:44 p.m. UTC | #1
On Tue, 2014-03-25 at 16:55 +0000, Julien Grall wrote:
> Fix compilation with clang 3.5:
> 
> xen/include/asm/platforms/omap5.h:1:9: error: '__ASM_ARM_PLATFORMS_OMAP5_H' is used as a header guard here, followed by #define of a different macro [-werror,-wheader-guard]
>                                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> xen/include/asm/platforms/omap5.h:2:9: note: '__ASM_ASM_PLATFORMS_OMAP5_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_OMAP5_H'?
>                                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>         __ASM_ARM_PLATFORMS_OMAP5_H
> 
> Signed-off-by: Julien Grall <julien.grall@linaro.org>

Acked-by:Ian Campbell <ian.campbell@citrix.com>

(I think this series would have been more manageable if it had fixed
each similar class of error in one patch....)
Julien Grall March 27, 2014, 4:52 p.m. UTC | #2
On 03/27/2014 04:44 PM, Ian Campbell wrote:

> (I think this series would have been more manageable if it had fixed
> each similar class of error in one patch....)

Sorry, I usually work with very small patch to understand every changes.
I though it was better to send as is it on the ML.

Regards
Ian Campbell March 27, 2014, 5:06 p.m. UTC | #3
On Thu, 2014-03-27 at 16:52 +0000, Julien Grall wrote:
> On 03/27/2014 04:44 PM, Ian Campbell wrote:
> 
> > (I think this series would have been more manageable if it had fixed
> > each similar class of error in one patch....)
> 
> Sorry, I usually work with very small patch to understand every changes.

I don't think a single "fix typos in header guard #defines" patch would
have hindered that, but it would have reduced this series to less than
30 patches, which would have been very worthwhile. Likewise for marking
BUILD_BUG_ON functions as always unused in a single patch and making
things static etc.

> I though it was better to send as is it on the ML.

Please try and keep the sanity of people trying to review dozens of
patches a day in mind.

Thanks,
Ian.
diff mbox

Patch

diff --git a/xen/include/asm-arm/platforms/omap5.h b/xen/include/asm-arm/platforms/omap5.h
index c559c84..8867b45 100644
--- a/xen/include/asm-arm/platforms/omap5.h
+++ b/xen/include/asm-arm/platforms/omap5.h
@@ -1,5 +1,5 @@ 
 #ifndef __ASM_ARM_PLATFORMS_OMAP5_H
-#define __ASM_ASM_PLATFORMS_OMAP5_H
+#define __ASM_ARM_PLATFORMS_OMAP5_H
 
 #define REALTIME_COUNTER_BASE                   0x48243200
 #define INCREMENTER_NUMERATOR_OFFSET            0x10