]> git.baikalelectronics.ru Git - kernel.git/commit
Fix compile brekage with !CONFIG_BLOCK
authorIngo Molnar <mingo@elte.hu>
Thu, 28 Oct 2010 14:39:24 +0000 (16:39 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 16:02:15 +0000 (09:02 -0700)
commit6b972628d353bcde8e5119fb78b2ba66a7361e62
tree50e7a8f4a275349ddb5902690533ed5b3deabef4
parenta597c25ca7fcc6df1fcd57f91a9757819ac71c5e
Fix compile brekage with !CONFIG_BLOCK

Today's git tree fails to build on !CONFIG_BLOCK, due to upstream commit
06719a85deb6 ("fs: Add FITRIM ioctl"):

 include/linux/fs.h:36: error: expected specifier-qualifier-list before ‘uint64_t’
 include/linux/fs.h:36: error: expected specifier-qualifier-list before ‘uint64_t’
 include/linux/fs.h:36: error: expected specifier-qualifier-list before ‘uint64_t’

The commit adds uint64_t type usage to fs.h, but linux/types.h is not included
explicitly - it's only included implicitly via linux/blk_types.h, and there only if
CONFIG_BLOCK is enabled.

Add the explicit #include to fix this.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/fs.h