[PATCH] rbtree: include linux/compiler.h for definition of __always_inline

[PATCH] rbtree: include linux/compiler.h for definition of __always_inline

[Will Deacon]

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’

This patch includes linux/compiler.h in rbtree_augmented.h so that the
__always_inline macro is resolved correctly.

Cc: Pekka Enberg <penberg@kernel.org>
Cc: Michel Lespinasse <walken@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 include/linux/rbtree_augmented.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
index 214caa3..2ac60c9 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>
 
 /*
-- 
1.7.4.1

Re: [PATCH] rbtree: include linux/compiler.h for definition of __always_inline

[Michel Lespinasse]

On Mon, Oct 22, 2012 at 10:01 AM, Will Deacon <will.deacon@arm.com> wrote:
> 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’
>
> This patch includes linux/compiler.h in rbtree_augmented.h so that the
> __always_inline macro is resolved correctly.
>
> Cc: Pekka Enberg <penberg@kernel.org>
> Cc: Michel Lespinasse <walken@google.com>
> Cc: Ingo Molnar <mingo@elte.hu>
> Signed-off-by: Will Deacon <will.deacon@arm.com>

Just curious - what are you going to implement with augmented rbtrees
in kvm tool ?

If the basic rbtree or the interval tree implementations are
sufficient for your usage, you should try using that (in which case
you won't need this header fix).

But either way, the header fix is correct and will be required when
someone wants to use augmented rbtrees outside of the kernel. I just
didn't think that day would come so fast :)

Reviewed-by: Michel Lespinasse <walken@google.com>

-- 
Michel "Walken" Lespinasse
A program is never fully debugged until the last user dies.

Re: [PATCH] rbtree: include linux/compiler.h for definition of __always_inline

[Will Deacon]

On Mon, Oct 22, 2012 at 10:56:21PM +0100, Michel Lespinasse wrote:
> On Mon, Oct 22, 2012 at 10:01 AM, Will Deacon <will.deacon@arm.com> wrote:
> > 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’
> >
> > This patch includes linux/compiler.h in rbtree_augmented.h so that the
> > __always_inline macro is resolved correctly.
> >
> > Cc: Pekka Enberg <penberg@kernel.org>
> > Cc: Michel Lespinasse <walken@google.com>
> > Cc: Ingo Molnar <mingo@elte.hu>
> > Signed-off-by: Will Deacon <will.deacon@arm.com>
> 
> Just curious - what are you going to implement with augmented rbtrees
> in kvm tool ?
> 
> If the basic rbtree or the interval tree implementations are
> sufficient for your usage, you should try using that (in which case
> you won't need this header fix).

kvm tool uses interval rbtrees for things like keeping track of virtual
devices, although it looks like Ingo implemented the augment callbacks
while moving to -rc1.

> But either way, the header fix is correct and will be required when
> someone wants to use augmented rbtrees outside of the kernel. I just
> didn't think that day would come so fast :)
> 
> Reviewed-by: Michel Lespinasse <walken@google.com>

Thanks Michel!

Will

Re: [PATCH] rbtree: include linux/compiler.h for definition of __always_inline

[Ingo Molnar]

* Will Deacon <will.deacon@arm.com> wrote:

> On Mon, Oct 22, 2012 at 10:56:21PM +0100, Michel Lespinasse wrote:
> > On Mon, Oct 22, 2012 at 10:01 AM, Will Deacon <will.deacon@arm.com> wrote:
> > > 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???
> > >
> > > This patch includes linux/compiler.h in rbtree_augmented.h so that the
> > > __always_inline macro is resolved correctly.
> > >
> > > Cc: Pekka Enberg <penberg@kernel.org>
> > > Cc: Michel Lespinasse <walken@google.com>
> > > Cc: Ingo Molnar <mingo@elte.hu>
> > > Signed-off-by: Will Deacon <will.deacon@arm.com>
> > 
> > Just curious - what are you going to implement with augmented rbtrees
> > in kvm tool ?
> > 
> > If the basic rbtree or the interval tree implementations are
> > sufficient for your usage, you should try using that (in which case
> > you won't need this header fix).
> 
> kvm tool uses interval rbtrees for things like keeping track 
> of virtual devices, although it looks like Ingo implemented 
> the augment callbacks while moving to -rc1.

Yeah, latest kvmtool uses the modern augmented-rbtree facility 
of the kernel.

Thanks,

	Ingo