2010-02-23 02:26:34

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the block tree

Hi Jens,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

usr/include/linux/cciss_ioctl.h:6: included file 'linux/cciss_defs.h' is not exported

Caused by commit 429c42c9d246f5bda868495c09974312a0177328 ("cciss:
Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h").

I have used the block tree from next-20100222 for today.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/


Attachments:
(No filename) (482.00 B)
(No filename) (198.00 B)
Download all attachments

2010-02-23 04:52:25

by dann frazier

[permalink] [raw]
Subject: [PATCH] cciss: export linux/cciss_defs.h header

'make headers_check' began to fail after cciss_defs.h was introduced in:
429c42c9d246f5bda868495c09974312a0177328

usr/include/linux/cciss_ioctl.h:6: included file 'linux/cciss_defs.h' is not exported

Fix this by exporting cciss_defs.h

Signed-off-by: dann frazier <[email protected]>
---
include/linux/Kbuild | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 756f831..91be0d8 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -43,6 +43,7 @@ header-y += blkpg.h
header-y += bpqether.h
header-y += bsg.h
header-y += can.h
+header-y += cciss_defs.h
header-y += cdk.h
header-y += chio.h
header-y += coda_psdev.h
--
1.5.6.5

2010-02-23 07:39:07

by Jens Axboe

[permalink] [raw]
Subject: Re: [PATCH] cciss: export linux/cciss_defs.h header

On Mon, Feb 22 2010, dann frazier wrote:
> 'make headers_check' began to fail after cciss_defs.h was introduced in:
> 429c42c9d246f5bda868495c09974312a0177328
>
> usr/include/linux/cciss_ioctl.h:6: included file 'linux/cciss_defs.h' is not exported

Thanks Dann for the patch, and sorry Stephen for the breakage.

--
Jens Axboe