From: Paul Gortmaker <paul.gortmaker@windriver.com> To: Stephen Rothwell <sfr@canb.auug.org.au> Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Alex Deucher <alexander.deucher@amd.com>, Dave Airlie <airlied@redhat.com>, Linus <torvalds@linux-foundation.org> Subject: Re: linux-next: build failure after merge of the moduleh tree Date: Fri, 23 Mar 2012 08:49:31 -0400 [thread overview] Message-ID: <4F6C715B.2080104@windriver.com> (raw) In-Reply-To: <20120323155114.a1779aa050fa05f6191b7dae@canb.auug.org.au> On 12-03-23 12:51 AM, Stephen Rothwell wrote: > Hi Paul, > > After merging the moduleh tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/radeon/si_blit_shaders.c:252:1: error: implicit declaration of function 'BUILD_BUG_ON_ZERO' [-Werror=implicit-function-declaration] > drivers/gpu/drm/radeon/si_blit_shaders.c:252:1: error: initializer element is not constant > > Caused by commit 48c0c902e2e6 ("drm/radeon/kms: add support for CP setup > on SI") from Linus' tree interacting with commit 6c03438edeb5 ("kernel.h: > doesn't explicitly use bug.h, so don't include it"). Thanks Stephen, Too bad the radeon commits weren't in linux-next, then we'd not have to be fixing these in the merge window... I think it makes sense for me to fold this into: commit 50af5ead3b44ccf8bd2b4d2a50c1b610f557c480 Author: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Fri Jan 20 18:35:53 2012 -0500 bug.h: add include of it to various implicit C users in the bug-3.4 tree before requesting it to be pulled. Paul. -- > > ARRAY_SIZE in kernel.h uses __must_be_array from compiler{-ggc,-intel}.h > which uses BUILD_BUG_ON_ZERO ... I don;t know if we want to include > bug.h in compiler.h ... > > So, for today, I have added the following patch: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Fri, 23 Mar 2012 15:47:07 +1100 > Subject: [PATCH] kernel.h: using ARRAY_SIZE needs to include bug.h > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/gpu/drm/radeon/si_blit_shaders.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/si_blit_shaders.c b/drivers/gpu/drm/radeon/si_blit_shaders.c > index a7124b4..ec415e7 100644 > --- a/drivers/gpu/drm/radeon/si_blit_shaders.c > +++ b/drivers/gpu/drm/radeon/si_blit_shaders.c > @@ -25,6 +25,7 @@ > */ > > #include <linux/types.h> > +#include <linux/bug.h> > #include <linux/kernel.h> > > const u32 si_default_state[] =
WARNING: multiple messages have this Message-ID (diff)
From: Paul Gortmaker <paul.gortmaker@windriver.com> To: Stephen Rothwell <sfr@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alex Deucher <alexander.deucher@amd.com>, Dave Airlie <airlied@redhat.com>, Linus <torvalds@linux-foundation.org> Subject: Re: linux-next: build failure after merge of the moduleh tree Date: Fri, 23 Mar 2012 08:49:31 -0400 [thread overview] Message-ID: <4F6C715B.2080104@windriver.com> (raw) In-Reply-To: <20120323155114.a1779aa050fa05f6191b7dae@canb.auug.org.au> On 12-03-23 12:51 AM, Stephen Rothwell wrote: > Hi Paul, > > After merging the moduleh tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/gpu/drm/radeon/si_blit_shaders.c:252:1: error: implicit declaration of function 'BUILD_BUG_ON_ZERO' [-Werror=implicit-function-declaration] > drivers/gpu/drm/radeon/si_blit_shaders.c:252:1: error: initializer element is not constant > > Caused by commit 48c0c902e2e6 ("drm/radeon/kms: add support for CP setup > on SI") from Linus' tree interacting with commit 6c03438edeb5 ("kernel.h: > doesn't explicitly use bug.h, so don't include it"). Thanks Stephen, Too bad the radeon commits weren't in linux-next, then we'd not have to be fixing these in the merge window... I think it makes sense for me to fold this into: commit 50af5ead3b44ccf8bd2b4d2a50c1b610f557c480 Author: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Fri Jan 20 18:35:53 2012 -0500 bug.h: add include of it to various implicit C users in the bug-3.4 tree before requesting it to be pulled. Paul. -- > > ARRAY_SIZE in kernel.h uses __must_be_array from compiler{-ggc,-intel}.h > which uses BUILD_BUG_ON_ZERO ... I don;t know if we want to include > bug.h in compiler.h ... > > So, for today, I have added the following patch: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Fri, 23 Mar 2012 15:47:07 +1100 > Subject: [PATCH] kernel.h: using ARRAY_SIZE needs to include bug.h > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/gpu/drm/radeon/si_blit_shaders.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/si_blit_shaders.c b/drivers/gpu/drm/radeon/si_blit_shaders.c > index a7124b4..ec415e7 100644 > --- a/drivers/gpu/drm/radeon/si_blit_shaders.c > +++ b/drivers/gpu/drm/radeon/si_blit_shaders.c > @@ -25,6 +25,7 @@ > */ > > #include <linux/types.h> > +#include <linux/bug.h> > #include <linux/kernel.h> > > const u32 si_default_state[] =
next prev parent reply other threads:[~2012-03-23 12:50 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-23 4:51 linux-next: build failure after merge of the moduleh tree Stephen Rothwell 2012-03-23 12:49 ` Paul Gortmaker [this message] 2012-03-23 12:49 ` Paul Gortmaker 2012-03-23 13:03 ` Stephen Rothwell 2012-03-23 13:03 ` Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2011-11-01 7:38 Stephen Rothwell 2011-10-12 6:29 Stephen Rothwell 2011-10-12 19:25 ` Arend van Spriel 2011-10-12 19:26 ` John W. Linville 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 7:35 ` Kalle Valo 2011-10-04 8:14 ` Stephen Rothwell 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-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 8:35 ` Stephen Rothwell 2011-09-28 16:42 ` Kalle Valo 2011-09-28 16:42 ` Kalle Valo 2011-09-28 8:25 Stephen Rothwell 2011-09-28 8:25 ` Stephen Rothwell 2011-09-28 8:18 Stephen Rothwell 2011-10-09 5:08 ` Paul Gortmaker 2011-10-09 5:08 ` Paul Gortmaker 2011-10-09 18:01 ` Chris Ball 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-23 5:08 Stephen Rothwell 2011-08-23 9:59 ` Felipe Balbi 2011-09-02 18:32 ` Geert Uytterhoeven 2011-09-05 10:39 ` Felipe Balbi 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-31 6:59 ` Paul Gortmaker 2011-07-29 7:06 Stephen Rothwell 2011-07-31 7:44 ` Paul Gortmaker 2011-07-31 7:44 ` Paul Gortmaker 2011-08-01 0:30 ` Stephen Rothwell 2011-08-01 0:30 ` Stephen Rothwell 2011-07-29 6:48 Stephen Rothwell 2011-07-31 7:30 ` Paul Gortmaker 2011-07-31 7:30 ` Paul Gortmaker 2011-07-29 6:24 Stephen Rothwell 2011-07-31 7:26 ` Paul Gortmaker 2011-07-31 7:26 ` Paul Gortmaker 2011-07-29 6:19 Stephen Rothwell 2011-07-31 8:08 ` Paul Gortmaker 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 6:31 ` Paul Gortmaker 2011-07-31 8:14 ` 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-31 4:45 ` Paul Gortmaker 2011-07-29 4:56 Stephen Rothwell 2011-07-31 5:44 ` Paul Gortmaker 2011-07-31 5:44 ` Paul Gortmaker
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=4F6C715B.2080104@windriver.com \ --to=paul.gortmaker@windriver.com \ --cc=airlied@redhat.com \ --cc=alexander.deucher@amd.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=sfr@canb.auug.org.au \ --cc=torvalds@linux-foundation.org \ /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: linkBe 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.