All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, arm@kernel.org,
	Arnd Bergmann <arnd@arndb.de>, Tony Lindgren <tony@atomide.com>
Subject: [PATCH 4/9] ARM: omap: add include guard for soc.h
Date: Thu, 14 Feb 2013 23:47:46 +0100	[thread overview]
Message-ID: <1360882071-4072668-5-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1360882071-4072668-1-git-send-email-arnd@arndb.de>

Commit e4c060db "ARM: OMAP: Split plat/cpu.h into local soc.h for
mach-omap1 and mach-omap2" moved the bulk of "plat/cpu.h" into "cpu.h"
but did not add an include guard for the new file that was present
in the old one. There are cases where the file is indeed included
multiple times, probably by accident, but adding the include
guard ensures that this has no further consequences.

Without this patch, building allmodconfig results in lots of warnings like:

In file included from arch/arm/mach-omap2/drm.c:31:0:
arch/arm/mach-omap2/soc.h:206:0: warning: "cpu_is_omap24xx" redefined [enabled by default]
In file included from arch/arm/mach-omap2/drm.c:28:0:
arch/arm/mach-omap2/soc.h:227:0: note: this is the location of the previous definition
In file included from arch/arm/mach-omap2/drm.c:31:0:
arch/arm/mach-omap2/soc.h:207:0: warning: "cpu_is_omap242x" redefined [enabled by default]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/soc.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index c62116b..97dd373 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -24,6 +24,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
+#ifndef OMAP2_SOC_H
+#define OMAP2_SOC_H
 
 #include "omap24xx.h"
 #include "omap34xx.h"
@@ -497,3 +499,4 @@ level(__##fn);
 
 #endif	/* __ASSEMBLY__ */
 
+#endif
-- 
1.8.1.2


WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/9] ARM: omap: add include guard for soc.h
Date: Thu, 14 Feb 2013 23:47:46 +0100	[thread overview]
Message-ID: <1360882071-4072668-5-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1360882071-4072668-1-git-send-email-arnd@arndb.de>

Commit e4c060db "ARM: OMAP: Split plat/cpu.h into local soc.h for
mach-omap1 and mach-omap2" moved the bulk of "plat/cpu.h" into "cpu.h"
but did not add an include guard for the new file that was present
in the old one. There are cases where the file is indeed included
multiple times, probably by accident, but adding the include
guard ensures that this has no further consequences.

Without this patch, building allmodconfig results in lots of warnings like:

In file included from arch/arm/mach-omap2/drm.c:31:0:
arch/arm/mach-omap2/soc.h:206:0: warning: "cpu_is_omap24xx" redefined [enabled by default]
In file included from arch/arm/mach-omap2/drm.c:28:0:
arch/arm/mach-omap2/soc.h:227:0: note: this is the location of the previous definition
In file included from arch/arm/mach-omap2/drm.c:31:0:
arch/arm/mach-omap2/soc.h:207:0: warning: "cpu_is_omap242x" redefined [enabled by default]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/soc.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index c62116b..97dd373 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -24,6 +24,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
+#ifndef OMAP2_SOC_H
+#define OMAP2_SOC_H
 
 #include "omap24xx.h"
 #include "omap34xx.h"
@@ -497,3 +499,4 @@ level(__##fn);
 
 #endif	/* __ASSEMBLY__ */
 
+#endif
-- 
1.8.1.2

  parent reply	other threads:[~2013-02-14 22:47 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-14 22:47 [PATCH 0/9] arm-soc/for-next allyesconfig build regressions Arnd Bergmann
2013-02-14 22:47 ` Arnd Bergmann
2013-02-14 22:47 ` [PATCH 1/9] ARM: arch_timer: include linux/errno.h Arnd Bergmann
2013-02-14 22:47   ` Arnd Bergmann
2013-02-15 10:26   ` Mark Rutland
2013-02-15 10:26     ` Mark Rutland
2013-02-15 18:33     ` Arnd Bergmann
2013-02-15 18:33       ` Arnd Bergmann
2013-02-14 22:47 ` [PATCH 2/9] ARM: imx: MACH_MX31ADS_WM1133_EV1 needs REGULATOR_WM8350 Arnd Bergmann
2013-02-14 22:47   ` Arnd Bergmann
2013-02-15 17:21   ` Sascha Hauer
2013-02-15 17:21     ` Sascha Hauer
2013-02-14 22:47 ` [PATCH 3/9] ARM: omap2: include linux/errno.h in hwmod_reset Arnd Bergmann
2013-02-14 22:47   ` Arnd Bergmann
2013-02-14 22:51   ` Tony Lindgren
2013-02-14 22:51     ` Tony Lindgren
2013-02-15 12:38     ` Arnd Bergmann
2013-02-15 12:38       ` Arnd Bergmann
2013-02-14 22:58   ` Paul Walmsley
2013-02-14 22:58     ` Paul Walmsley
2013-02-14 22:47 ` Arnd Bergmann [this message]
2013-02-14 22:47   ` [PATCH 4/9] ARM: omap: add include guard for soc.h Arnd Bergmann
2013-02-14 22:55   ` Tony Lindgren
2013-02-14 22:55     ` Tony Lindgren
2013-02-14 23:11     ` Arnd Bergmann
2013-02-14 23:11       ` Arnd Bergmann
2013-02-15 12:40     ` Arnd Bergmann
2013-02-15 12:40       ` Arnd Bergmann
2013-02-14 22:47 ` [PATCH 5/9] drm: export drm_vm_open_locked Arnd Bergmann
2013-02-14 22:47   ` Arnd Bergmann
2013-02-14 22:47 ` [PATCH 6/9] net: cwdavinci_cpdma: export symbols for cpsw Arnd Bergmann
2013-02-14 22:47   ` Arnd Bergmann
2013-02-14 22:52   ` David Miller
2013-02-14 22:52     ` David Miller
2013-02-14 22:47 ` [PATCH 7/9] remoteproc: omap: depend on OMAP_MBOX_FWK Arnd Bergmann
2013-02-14 22:47   ` Arnd Bergmann
2013-02-14 22:55   ` Tony Lindgren
2013-02-14 22:55     ` Tony Lindgren
2013-02-15  6:56     ` Ohad Ben-Cohen
2013-02-15  6:56       ` Ohad Ben-Cohen
2013-02-14 22:47 ` [PATCH 8/9] [HACK] ARM: imx: work around v7_cpu_resume link error Arnd Bergmann
2013-02-14 22:47   ` Arnd Bergmann
2013-02-14 23:45   ` Stephen Warren
2013-02-14 23:45     ` Stephen Warren
2013-02-15 11:05     ` Arnd Bergmann
2013-02-15 11:05       ` Arnd Bergmann
2013-02-15 11:13       ` Russell King - ARM Linux
2013-02-15 11:13         ` Russell King - ARM Linux
2013-02-15 15:49         ` Arnd Bergmann
2013-02-15 15:49           ` Arnd Bergmann
2013-02-15 11:07   ` Russell King - ARM Linux
2013-02-15 11:07     ` Russell King - ARM Linux
2013-02-16  5:14     ` Nicolas Pitre
2013-02-16  5:14       ` Nicolas Pitre
2013-02-18  5:55       ` Shawn Guo
2013-02-18  5:55         ` Shawn Guo
2013-02-18 17:06         ` Nicolas Pitre
2013-02-18 17:06           ` Nicolas Pitre
2013-02-19  1:42           ` Shawn Guo
2013-02-19  1:42             ` Shawn Guo
2013-02-19  4:11             ` Nicolas Pitre
2013-02-19  4:11               ` Nicolas Pitre
2013-02-19  5:10               ` Shawn Guo
2013-02-19  5:10                 ` Shawn Guo
2013-02-14 22:47 ` [PATCH 9/9] [media] davinci: do not include mach/hardware.h Arnd Bergmann
2013-02-14 22:47   ` Arnd Bergmann
2013-02-14 22:57   ` Tony Lindgren
2013-02-14 22:57     ` Tony Lindgren
2013-02-15  5:06   ` Prabhakar Lad
2013-02-15  5:06     ` Prabhakar Lad

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360882071-4072668-5-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=arm@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.