Re: linux-next: build failure after merge of the moduleh tree

public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Felipe Balbi <balbi@ti•com>
To: Geert Uytterhoeven <geert@linux-m68k•org>
Cc: balbi@ti•com, Stephen Rothwell <sfr@canb•auug.org.au>,
	Paul Gortmaker <paul.gortmaker@windriver•com>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Greg KH <greg@kroah•com>
Subject: Re: linux-next: build failure after merge of the moduleh tree
Date: Mon, 5 Sep 2011 13:39:50 +0300	[thread overview]
Message-ID: <20110905103948.GD18442@legolas.emea.dhcp.ti.com> (raw)
In-Reply-To: <CAMuHMdWGtsNN3_26PZYOGQjDid4rXRxxssQVDCDsNSim_FJwdg@mail.gmail.com>

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

Hi,

On Fri, Sep 02, 2011 at 08:32:09PM +0200, Geert Uytterhoeven wrote:
> On Tue, Aug 23, 2011 at 11:59, Felipe Balbi <balbi@ti•com> wrote:
> > On Tue, Aug 23, 2011 at 03:08:54PM +1000, Stephen Rothwell wrote:
> >> After merging the moduleh tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
> >> drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)
> >>
> >> Caused by the interaction of the module.h split up with commit
> >> 72246da40f37 ("usb: Introduce DesignWare USB3 DRD Driver") from the usb
> >> tree.
> >>
> >> I have applied this patch for today (Greg, this should be applied to your
> >> tree):
> >>
> >> From: Stephen Rothwell <sfr@canb•auug.org.au>
> >> Date: Tue, 23 Aug 2011 15:05:25 +1000
> >> Subject: [PATCH] usb: include module.h in the DesignWare USB3 DRD driver
> >>
> >> Fixes this build error:
> >>
> >> drivers/usb/dwc3/dwc3-pci.c: In function 'dwc3_pci_init':
> >> drivers/usb/dwc3/dwc3-pci.c:211:9: error: 'THIS_MODULE' undeclared (first use in this function)
> >>
> >> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> >> ---
> >>  drivers/usb/dwc3/dwc3-pci.c |    1 +
> >>  1 files changed, 1 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> >> index 2578595..e3b77d2 100644
> >> --- a/drivers/usb/dwc3/dwc3-pci.c
> >> +++ b/drivers/usb/dwc3/dwc3-pci.c
> >> @@ -38,6 +38,7 @@
> >>   */
> >>
> >>  #include <linux/kernel.h>
> >> +#include <linux/module.h>
> >
> > that was my fault, I didn't know about Paul's commit. Please Greg, apply
> > this to your tree:
> >
> > Acked-by: Felipe Balbi <balbi@ti•com>
> 
> The include should also be added to drivers/usb/dwc3/core.c and
> drivers/usb/dwc3/dwc3-omap.c,
> cfr. http://kisskb.ellerman.id.au/kisskb/buildresult/4491952/

that's true, here's a patch for that:

From 2b248785ee47dd16bb8fa544f80f7e2e51919e8c Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti•com>
Date: Mon, 5 Sep 2011 13:37:28 +0300
Subject: [PATCH] usb: dwc3: add module.h to dwc3-omap.c and core.c
Organization: Texas Instruments\n

We need that header because of THIS_MODULE.

Reported-by: Geert Uytterhoeven <geert@linux-m68k•org>
Signed-off-by: Felipe Balbi <balbi@ti•com>
---
 drivers/usb/dwc3/core.c      |    1 +
 drivers/usb/dwc3/dwc3-omap.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 6aa0913..64ba097 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -37,6 +37,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index ddbf38a..8a5d6ae 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -37,6 +37,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-- 
1.7.6.396.ge0613

I'll send this to Greg once hera is back up and running.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

next prev parent reply	other threads:[~2011-09-05 10:39 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-23  5:08 linux-next: build failure after merge of the moduleh tree Stephen Rothwell
2011-08-23  9:59 ` Felipe Balbi
2011-09-02 18:32   ` Geert Uytterhoeven
2011-09-05 10:39     ` Felipe Balbi [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-03-23  4:51 Stephen Rothwell
2012-03-23 12:49 ` Paul Gortmaker
2012-03-23 13:03   ` Stephen Rothwell
2011-11-01  7:38 Stephen Rothwell
2011-10-12  6:29 Stephen Rothwell
2011-10-11  8:39 Stephen Rothwell
2011-10-11  8:25 Stephen Rothwell
2011-10-11 13:05 ` Mark Brown
2011-10-04  7:32 Stephen Rothwell
2011-10-04  7:21 Stephen Rothwell
2011-10-04 15:24 ` Jonathan Cameron
2011-10-04  7:11 Stephen Rothwell
2011-10-04  7:03 Stephen Rothwell
2011-10-04  7:35 ` Kalle Valo
2011-10-04  8:14   ` Stephen Rothwell
2011-10-04 15:09     ` Larry Finger
2011-09-30  4:50 Stephen Rothwell
2011-09-30 12:52 ` Linus Walleij
2011-09-30 13:19   ` Stephen Rothwell
2011-10-03  6:55     ` Linus Walleij
2011-09-30 18:56 ` Paul Gortmaker
2011-09-28  8:41 Stephen Rothwell
2011-09-28 13:42 ` Paul Gortmaker
2011-09-29  0:15   ` Paul Gortmaker
2011-09-29  1:15     ` Stephen Rothwell
2011-09-28  8:35 Stephen Rothwell
2011-09-28 16:42 ` Kalle Valo
2011-09-28  8:25 Stephen Rothwell
2011-09-28  8:18 Stephen Rothwell
2011-10-09  5:08 ` Paul Gortmaker
2011-10-09 18:01   ` Chris Ball
2011-09-28  8:00 Stephen Rothwell
2011-09-28  7:50 Stephen Rothwell
2011-09-28  7:42 Stephen Rothwell
2011-09-28  7:58 ` Borislav Petkov
2011-09-28  7:10 Stephen Rothwell
2011-08-10  1:49 Stephen Rothwell
2011-08-03  4:16 Stephen Rothwell
2011-08-03 14:26 ` Greg KH
2011-08-03  4:10 Stephen Rothwell
2011-08-02  5:13 Stephen Rothwell
2011-08-02 10:15 ` Alasdair G Kergon
2011-08-01  3:58 Stephen Rothwell
2011-07-29  7:09 Stephen Rothwell
2011-07-31  6:59 ` Paul Gortmaker
2011-07-29  7:06 Stephen Rothwell
2011-07-31  7:44 ` Paul Gortmaker
2011-08-01  0:30   ` Stephen Rothwell
2011-07-29  6:48 Stephen Rothwell
2011-07-31  7:30 ` Paul Gortmaker
2011-07-29  6:24 Stephen Rothwell
2011-07-31  7:26 ` Paul Gortmaker
2011-07-29  6:19 Stephen Rothwell
2011-07-31  8:08 ` Paul Gortmaker
2011-07-29  5:41 Stephen Rothwell
2011-07-29  5:30 Stephen Rothwell
2011-07-29  5:25 Stephen Rothwell
2011-07-29  5:37 ` Stephen Rothwell
2011-07-31  6:31   ` Paul Gortmaker
2011-07-31  8:14 ` Paul Gortmaker
2011-07-29  5:10 Stephen Rothwell
2011-07-30 19:03 ` Dmitry Torokhov
2011-07-29  5:10 Stephen Rothwell
2011-07-31  4:45 ` Paul Gortmaker
2011-07-29  4:56 Stephen Rothwell
2011-07-31  5:44 ` Paul Gortmaker

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:6aa0913 dfblob:64ba097 dfblob:ddbf38a dfblob:8a5d6ae )
 OR (
bs:"usb: dwc3: add module.h to dwc3-omap.c and core.c" )
	(help)

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=20110905103948.GD18442@legolas.emea.dhcp.ti.com \
    --to=balbi@ti$(echo .)com \
    --cc=geert@linux-m68k$(echo .)org \
    --cc=greg@kroah$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=paul.gortmaker@windriver$(echo .)com \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

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

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox