Em Wed, May 27, 2015 at 05:19:36AM +0000, Wang Nan escreveu: > Following patches will introduce linux/bpf.h to a new libbpf library, > which requires definition of __aligned_u64. This patch add it to the > common types.h for tools.
This was already merged, see: http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/log/tools?h=perf/core More specifically: http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/tools?h=perf/core&id=70ba6b8f975bcff56e180e2c7550d2302fcbf923 So you can drop it from your patchset. BTW, where are you basing your work? If you do it over tip/perf/core you may find some of the trivial stuff being added there, like this one. - Arnaldo > Signed-off-by: Wang Nan <wangn...@huawei.com> > --- > tools/include/linux/types.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/tools/include/linux/types.h b/tools/include/linux/types.h > index b5cf25e..10a2cdc 100644 > --- a/tools/include/linux/types.h > +++ b/tools/include/linux/types.h > @@ -60,6 +60,11 @@ typedef __u32 __bitwise __be32; > typedef __u64 __bitwise __le64; > typedef __u64 __bitwise __be64; > > +/* Taken from uapi/linux/types.h. Required by linux/bpf.h */ > +#ifndef __aligned_u64 > +# define __aligned_u64 __u64 __attribute__((aligned(8))) > +#endif > + > struct list_head { > struct list_head *next, *prev; > }; > -- > 1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
