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

[Stephen Rothwell]

Hi Al,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from include/linux/tracehook.h:51:0,
                 from arch/powerpc/kernel/ptrace.c:25:
include/linux/security.h: In function 'securityfs_create_dir':
include/linux/security.h:3003:2: error: implicit declaration of function 'ERR_PTR' [-Werror=implicit-function-declaration]
include/linux/security.h:3003:2: error: return makes pointer from integer without a cast [-Werror]
include/linux/security.h: In function 'securityfs_create_file':
include/linux/security.h:3012:2: error: return makes pointer from integer without a cast [-Werror]
In file included from include/linux/fs.h:2283:0,
                 from include/linux/trace_seq.h:4,
                 from include/linux/ftrace_event.h:5,
                 from include/trace/syscall.h:6,
                 from arch/powerpc/kernel/ptrace.c:32:
include/linux/err.h: At top level:
include/linux/err.h:22:35: error: conflicting types for 'ERR_PTR'
include/linux/security.h:3003:9: note: previous implicit declaration of 'ERR_PTR' was here

And many more similar.

Probably caused by commit 3073cb2e813c ("trim security.h") which
presumably removed an include file that was including err.h :-(

I have used the vfs tree from next-20111216 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature