On Sun, Dec 22, 2013 at 9:21 AM, Chris Luke <[email protected]> wrote: > Just a note; this adds datapath/linux/compat/include/linux/bug.h but doesn’t > add that filename to datapath/linux/Modules.mk, breaking the build with this > error: > > The distribution is missing the following files: > datapath/linux/compat/include/linux/bug.h > > This seems to fix the build: > This looks good. Can you send signed-off, so that I can apply it?
> diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk > index 2f4a9c2..cedb8c9 100644 > --- a/datapath/linux/Modules.mk > +++ b/datapath/linux/Modules.mk > @@ -19,6 +19,7 @@ openvswitch_headers += \ > linux/compat/gso.h \ > linux/compat/include/asm/hash.h \ > linux/compat/include/asm/percpu.h \ > + linux/compat/include/linux/bug.h \ > linux/compat/include/linux/compiler.h \ > linux/compat/include/linux/compiler-gcc.h \ > linux/compat/include/linux/cpumask.h \ > > From: [email protected] [mailto:[email protected]] On > Behalf Of Andy Zhou > Sent: Friday, December 20, 2013 21:03 > To: Pravin Shelar > Cc: [email protected] > Subject: Re: [ovs-dev] [PATCH] datapath: Fix sparse warning on > BUILD_BUG_ON_INVALID() > > Thanks, pushed to the master. > > On Fri, Dec 20, 2013 at 5:34 PM, Pravin Shelar <[email protected]> wrote: > After chatting with Andy offline, it looks good to me. > > Acked-by: Pravin B Shelar <[email protected]> > > On Fri, Dec 20, 2013 at 5:19 PM, Pravin Shelar <[email protected]> wrote: >> On Fri, Dec 20, 2013 at 4:25 PM, Andy Zhou <[email protected]> wrote: >>> Sparse gives the following warnings when compile against Linux kernel >>> 3.5: >>> >>> CHECK /root/projs/ovs/openvswitch/datapath/linux/skbuff-openvswitch.c >>> include/linux/mm.h:405:9: error: undefined identifier >>> 'BUILD_BUG_ON_INVALID' >>> include/linux/mm.h:405:9: error: not a function <noident> >>> >>> The same issues may exists on 3.6 as well. >>> >> Can you define BUILD_BUG_ON_INVALID() like upstream kernel? >> >>> Signed-off-by: Andy Zhou <[email protected]> >>> --- >>> datapath/linux/compat/include/linux/bug.h | 13 +++++++++++++ >>> 1 file changed, 13 insertions(+) >>> create mode 100644 datapath/linux/compat/include/linux/bug.h >>> >>> diff --git a/datapath/linux/compat/include/linux/bug.h > b/datapath/linux/compat/include/linux/bug.h >>> new file mode 100644 >>> index 0000000..551f07f >>> --- /dev/null >>> +++ b/datapath/linux/compat/include/linux/bug.h >>> @@ -0,0 +1,13 @@ >>> +#ifndef __LINUX_BUG_WRAPPER_H >>> +#define __LINUX_BUG_WRAPPER_H 1 >>> + >>> +#include_next <linux/bug.h> >>> + >>> +#ifdef __CHECKER__ >>> +#ifndef BUILD_BUG_ON_INVALID >>> +#define BUILD_BUG_ON_INVALID(e) (0) >>> +#endif >>> + >>> +#endif /* __CHECKER__ */ >>> + >>> +#endif >>> -- >>> 1.7.9.5 >>> >>> _______________________________________________ >>> dev mailing list >>> [email protected] >>> http://openvswitch.org/mailman/listinfo/dev > > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
