From: Will Deacon Date: Thu, 25 Oct 2012 20:37:53 +0000 (-0700) Subject: rbtree: include linux/compiler.h for definition of __always_inline X-Git-Tag: MMI-PSA29.97-13-9~15645^2~10 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=29fc7c5a4f516d388fb6e1f6d24bfb04b8093e54;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Cc: Pekka Enberg Reviewed-by: Michel Lespinasse Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h index 214caa33433b..2ac60c9cf644 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 #include /*