Re: [RFC PATCH 05/16] kvm tools: don't bother including linux/compiler.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



[ apologies if you receive this twice -- my email is playing up ]

Hi Pekka,

On Tue, Nov 13, 2012 at 07:26:36AM +0000, Pekka Enberg wrote:
> On Mon, 12 Nov 2012, Will Deacon wrote:
> > diff --git a/tools/kvm/include/linux/stddef.h b/tools/kvm/include/linux/stddef.h
> > index 60ea512..39da808 100644
> > --- a/tools/kvm/include/linux/stddef.h
> > +++ b/tools/kvm/include/linux/stddef.h
> > @@ -1,16 +1,10 @@
> >  #ifndef _LINUX_STDDEF_H
> >  #define _LINUX_STDDEF_H
> >  
> > -#include <linux/compiler.h>
> > -
> >  #undef NULL
> >  #define NULL ((void *)0)
> >  
> >  #undef offsetof
> > -#ifdef __compiler_offsetof
> > -#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
> > -#else
> >  #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
> > -#endif
> >  
> >  #endif
> 
> I'm seeing the following breakage with this patch applied:
> 
> [penberg@tux kvm]$ make
>   CC       hw/rtc.o
>   CC       ioport.o
>   CC       kvm-cpu.o
>   CC       kvm.o
> In file included from include/kvm/rbtree-interval.h:4:0,
>                  from include/kvm/ioport.h:4,
>                  from hw/rtc.c:3:
> ../../include/linux/rbtree_augmented.h:125:24: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘void’
> In file included from include/kvm/rbtree-interval.h:4:0,
>                  from include/kvm/ioport.h:4,
>                  from ioport.c:1:
> ../../include/linux/rbtree_augmented.h:125:24: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘void’
> make: *** [hw/rtc.o] Error 1
> make: *** Waiting for unfinished jobs....
> make: *** [ioport.o] Error 1

I'm struggling to reproduce this with my tree. Can you confirm whether or
not you have commit 29fc7c5a4f51 ("rbtree: include linux/compiler.h for
definition of __always_inline") in your *kernel* sources please?

Cheers,

Will
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux