summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-10-25 13:37:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-25 14:37:52 -0700
commit29fc7c5a4f516d388fb6e1f6d24bfb04b8093e54 (patch)
tree0738c3af1ae23cc25fea89d75ccff0f68b7b5ee2
parenteedce141cd2dad8d0cefc5468ef41898949a7031 (diff)
downloadlinux-3.10-29fc7c5a4f516d388fb6e1f6d24bfb04b8093e54.tar.gz
linux-3.10-29fc7c5a4f516d388fb6e1f6d24bfb04b8093e54.tar.bz2
linux-3.10-29fc7c5a4f516d388fb6e1f6d24bfb04b8093e54.zip
rbtree: include linux/compiler.h for definition of __always_inline
rb_erase_augmented() is a static function annotated with __always_inline. This causes a compile failure when attempting to use the rbtree implementation as a library (e.g. kvm tool): rbtree_augmented.h:125:24: error: expected `=', `,', `;', `asm' or `__attribute__' before `void' Include linux/compiler.h in rbtree_augmented.h so that the __always_inline macro is resolved correctly. Signed-off-by: Will Deacon <will.deacon@arm.com> Cc: Pekka Enberg <penberg@kernel.org> Reviewed-by: Michel Lespinasse <walken@google.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/rbtree_augmented.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
index 214caa33433..2ac60c9cf64 100644
--- a/include/linux/rbtree_augmented.h
+++ b/include/linux/rbtree_augmented.h
@@ -24,6 +24,7 @@
#ifndef _LINUX_RBTREE_AUGMENTED_H
#define _LINUX_RBTREE_AUGMENTED_H
+#include <linux/compiler.h>
#include <linux/rbtree.h>
/*