Fwd: Re: Broken builds

Fwd: Re: Broken builds

[Russell King - ARM Linux]

Linus,

Can you please apply the patch below.  I've been waiting 10 days so far
for a fix for the build problem to get through the "normal" channels,
and it seems to be stuck with the FBdev maintainer, who "missed -rc2"
with his pull request - and still hasn't submitted it.

Tomi Valkeinen has a different fix to this, which is the one stuck in
the fbdev maintainers tree.

I'm fed up with waiting for this build breakage to get fixed, and to
think how badly I get flamed if I do something even sneeze wrongly in
the direction of any x86 code...

----- Forwarded message from Tony Lindgren <tony@atomide.com> -----

Date: Tue, 5 Jun 2012 01:22:18 -0700
From: Tony Lindgren <tony@atomide.com>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: linux-omap@vger.kernel.org, Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: Re: Broken builds
Delivery-date: Tue, 05 Jun 2012 09:22:25 +0100

* Russell King - ARM Linux <linux@arm.linux.org.uk> [120603 11:05]:
> Looks like the DSS stuff has broken OMAP builds again during this
> merge window:
> 
> drivers/video/omap2/dss/core.c:197: error: static declaration of 'dss_debugfs_create_file' follows non-static declaration
> drivers/video/omap2/dss/dss.h:166: error: previous declaration of 'dss_debugfs_create_file' was here
> 
> Both the OMAP3 and OMAP4 builds break with these two errors.

Here's a patch for Tomi to fix this one.

Tony


From: Tony Lindgren <tony@atomide.com>
Date: Tue, 5 Jun 2012 01:20:55 -0700
Subject: [PATCH] OMAPDSS: Fix compile for dss_debugfs_create_file

Otherwise we get:

drivers/video/omap2/dss/core.c:197: error: static declaration of
'dss_debugfs_create_file' follows non-static declaration
drivers/video/omap2/dss/dss.h:166: error: previous declaration of
'dss_debugfs_create_file' was here

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>

--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -194,7 +194,7 @@ static inline int dss_initialize_debugfs(void)
 static inline void dss_uninitialize_debugfs(void)
 {
 }
-static inline int dss_debugfs_create_file(const char *name,
+int dss_debugfs_create_file(const char *name,
 		void (*write)(struct seq_file *))
 {
 	return 0;

----- End forwarded message -----

Re: Fwd: Re: Broken builds

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 2298 bytes --]

On Wed, 2012-06-13 at 10:57 +0100, Russell King - ARM Linux wrote:
> Linus,
> 
> Can you please apply the patch below.  I've been waiting 10 days so far
> for a fix for the build problem to get through the "normal" channels,
> and it seems to be stuck with the FBdev maintainer, who "missed -rc2"
> with his pull request - and still hasn't submitted it.

Note also that I sent the fix quite late, as I was on paternity leave.
So Florian didn't have many days to react.

> Tomi Valkeinen has a different fix to this, which is the one stuck in
> the fbdev maintainers tree.
> 
> I'm fed up with waiting for this build breakage to get fixed, and to
> think how badly I get flamed if I do something even sneeze wrongly in
> the direction of any x86 code...

Here's also my pull request, perhaps it's easier to pull it instead of
applying the patch.


The following changes since commit e92a5b28f71aea01b281f9c89d97a4bc5b24748f:

  OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request (2012-05-22 11:00:09 +0300)

are available in the git repository at:

  git://gitorious.org/linux-omap-dss2/linux.git tags/omapdss-for-3.5-rc2

for you to fetch changes up to c3a21fc79b6bc097d8b0e47498903a649a111127:

  OMAPDSS: fix registration of DPI and SDI devices (2012-06-05 17:15:24 +0300)

----------------------------------------------------------------
Small fixes for omapdss driver. Most importantly, fixes a build problem when
debugfs or omapdss debug support is turned off, and fixes a suspend related
crash.

----------------------------------------------------------------
Archit Taneja (1):
      OMAPDSS: DSI: Fix bug when calculating LP command interleaving parameters

Tomi Valkeinen (4):
      OMAPDSS: fix build when DEBUG_FS or DSS_DEBUG_SUPPORT disabled
      OMAPDSS: Taal: fix compilation warning
      OMAPDSS: fix bogus WARN_ON in dss_runtime_put()
      OMAPDSS: fix registration of DPI and SDI devices

 arch/arm/mach-omap2/display.c             |    4 ++--
 drivers/video/omap2/displays/panel-taal.c |    2 +-
 drivers/video/omap2/dss/core.c            |    3 +--
 drivers/video/omap2/dss/dsi.c             |    2 +-
 drivers/video/omap2/dss/dss.c             |    2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]