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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

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").

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[] =
-- 
1.7.9.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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